ref: 6aabec8324a0ba265d9b497fe2e61d5f70575475
parent: 0c44115a21f56a1f26e53de8c41382f4fba51bf0
author: menno <menno>
date: Wed Sep 24 08:37:08 EDT 2003
Linux compilation
--- a/common/mp4v2/libmp4v2_st60.vcproj
+++ b/common/mp4v2/libmp4v2_st60.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="libmp4v2_st"
ProjectGUID="{0842E354-7635-4B5D-8709-9A373ED27DCA}"SccProjectName=""
@@ -33,18 +33,16 @@
ProgramDataBaseFileName=".\ST_Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- CompileAs="0"
- AdditionalOptions="">
+ CompileAs="0">
<IntelOptions
Optimization="2"
- InlineFuncExpansion="1"
- OmitFramePtrs="1"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="1"
StringPooling="1"
RuntimeLibrary="0"
BufferSecurityCheck="1"
- FunctionLevelLinking="1"
- AllOptions="/c /I ".\\" /nologo /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\ST_Release/libmp4v2_st60.pch" /Fo".\ST_Release/" /Fd".\ST_Release/" /Gd"
- MSOriginalAdditionalOptions=""/>
+ EnableFunctionLevelLinking="1"
+ AllOptions="/c /I ".\\" /nologo /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\ST_Release/libmp4v2_st60.pch" /Fo".\ST_Release/" /Fd".\ST_Release/" /Gd"/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -51,11 +49,9 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\ST_Release\libmp4v2_st60.lib"
- SuppressStartupBanner="TRUE"
- AdditionalOptions="">
+ SuppressStartupBanner="TRUE">
<IntelOptions
- AllOptions="/OUT:".\ST_Release\libmp4v2_st60.lib" /NOLOGO"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/OUT:".\ST_Release\libmp4v2_st60.lib" /NOLOGO"/>
</Tool>
<Tool
Name="VCMIDLTool"/>
@@ -70,6 +66,12 @@
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
<IntelOptions
CompilerName="1"/>
</Configuration>
@@ -94,15 +96,13 @@
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
- CompileAs="0"
- AdditionalOptions="">
+ CompileAs="0">
<IntelOptions
Optimization="0"
MinimalRebuild="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- AllOptions="/c /I ".\\" /Z7 /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\ST_Debug/libmp4v2_st60.pch" /Fo".\ST_Debug/" /Fd".\ST_Debug/" /Gd"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/c /I ".\\" /Z7 /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\ST_Debug/libmp4v2_st60.pch" /Fo".\ST_Debug/" /Fd".\ST_Debug/" /Gd"/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -109,11 +109,9 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\ST_Debug\libmp4v2_st60.lib"
- SuppressStartupBanner="TRUE"
- AdditionalOptions="">
+ SuppressStartupBanner="TRUE">
<IntelOptions
- AllOptions="/OUT:".\ST_Debug\libmp4v2_st60.lib" /NOLOGO"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/OUT:".\ST_Debug\libmp4v2_st60.lib" /NOLOGO"/>
</Tool>
<Tool
Name="VCMIDLTool"/>
@@ -128,10 +126,17 @@
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
<IntelOptions
CompilerName="1"/>
</Configuration>
</Configurations>
+ <References/>
<Files>
<Filter
Name="source"
@@ -159,10 +164,16 @@
<File
RelativePath=".\atom_elst.cpp"/>
<File
+ RelativePath=".\atom_enca.cpp"/>
+ <File
+ RelativePath=".\atom_encv.cpp"/>
+ <File
RelativePath=".\atom_esds.cpp"/>
<File
RelativePath=".\atom_free.cpp"/>
<File
+ RelativePath=".\atom_frma.cpp"/>
+ <File
RelativePath=".\atom_ftyp.cpp"/>
<File
RelativePath=".\atom_hdlr.cpp"/>
@@ -173,8 +184,12 @@
<File
RelativePath=".\atom_hnti.cpp"/>
<File
+ RelativePath=".\atom_iKMS.cpp"/>
+ <File
RelativePath=".\atom_iods.cpp"/>
<File
+ RelativePath=".\atom_iSFM.cpp"/>
+ <File
RelativePath=".\atom_maxr.cpp"/>
<File
RelativePath=".\atom_mdat.cpp"/>
@@ -183,6 +198,8 @@
<File
RelativePath=".\atom_mdia.cpp"/>
<File
+ RelativePath=".\atom_meta.cpp"/>
+ <File
RelativePath=".\atom_mfhd.cpp"/>
<File
RelativePath=".\atom_minf.cpp"/>
@@ -213,8 +230,14 @@
<File
RelativePath=".\atom_rtp.cpp"/>
<File
+ RelativePath=".\atom_schi.cpp"/>
+ <File
+ RelativePath=".\atom_schm.cpp"/>
+ <File
RelativePath=".\atom_sdp.cpp"/>
<File
+ RelativePath=".\atom_sinf.cpp"/>
+ <File
RelativePath=".\atom_smhd.cpp"/>
<File
RelativePath=".\atom_snro.cpp"/>
@@ -237,8 +260,6 @@
<File
RelativePath=".\atom_stts.cpp"/>
<File
- RelativePath="atom_tag4.cpp"/>
- <File
RelativePath=".\atom_tfhd.cpp"/>
<File
RelativePath=".\atom_tims.cpp"/>
@@ -290,6 +311,8 @@
RelativePath=".\mp4file.cpp"/>
<File
RelativePath=".\mp4file_io.cpp"/>
+ <File
+ RelativePath=".\mp4meta.cpp"/>
<File
RelativePath=".\mp4property.cpp"/>
<File
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
AC_INIT()
AM_INIT_AUTOMAKE(faad2,2.0)
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for programs.
@@ -11,12 +11,15 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_PROG_RANLIB
AM_CONFIG_HEADER(config.h)
-AC_ARG_WITH( xmms,[ --with-xmms compile XMMS plugin],WITHXMMS=$withval, WITHXMMS=no)
+AC_ARG_WITH( xmms,[ --with-xmms compile XMMS plugin],WITHXMMS=$withval, WITHXMMS=no)
+AC_ARG_WITH( xmmsmp4,[ --with-xmmsmp4 compile XMMS MP4 plugin],WITHXMMSMP4=$withval, WITHXMMSMP4=no)
+
+AC_ARG_WITH( drm,[ --with-drm compile libfaad with DRM support],WITHDRM=$withval, WITHDRM=no)
+
dnl Checks for header files required for mp4.h
AC_HEADER_STDC
AC_CHECK_HEADERS(stdint.h inttypes.h)
@@ -70,8 +73,10 @@
AM_CONDITIONAL(HAVE_MPEG4IP, true)
MPEG4IP_PLAYER_PLUGIN_DIR=`mpeg4ip-config --player-plugin-dir`
AC_SUBST(MPEG4IP_PLAYER_PLUGIN_DIR)
+ AC_OUTPUT(plugins/mpeg4ip/Makefile)
else
AM_CONDITIONAL(HAVE_MPEG4IP, false)
+ AC_OUTPUT(common/Makefile common/mp4v2/Makefile)
fi
if test x$WITHXMMS = xyes; then
@@ -83,6 +88,8 @@
AM_CONDITIONAL(HAVE_XMMS, false)
else
AM_CONDITIONAL(HAVE_XMMS, true)
+ AC_CONFIG_SUBDIRS(plugins/xmms)
+ AC_OUTPUT(plugins/xmms/Makefile plugins/xmms/src/Makefile)
fi
else
AM_CONDITIONAL(HAVE_XMMS, false)
@@ -89,19 +96,8 @@
xmmsplugin=no
fi
-if test x$external_mp4v2 = xyes; then
- if test x$xmmsplugin = xyes; then
- AC_CONFIG_SUBDIRS(common/mp4v2 plugins/xmms)
- AC_OUTPUT(libfaad/Makefile common/Makefile frontend/Makefile Makefile plugins/Makefile plugins/mpeg4ip/Makefile plugins/xmms/Makefile plugins/xmms/src/Makefile)
- else
- AC_CONFIG_SUBDIRS(common/mp4v2)
- AC_OUTPUT(libfaad/Makefile common/Makefile frontend/Makefile Makefile plugins/Makefile plugins/mpeg4ip/Makefile)
- fi
-else
- if test x$xmmsplugin = xyes; then
- AC_CONFIG_SUBDIRS(plugins/xmms)
- AC_OUTPUT(libfaad/Makefile frontend/Makefile common/Makefile Makefile plugins/Makefile common/mp4v2/Makefile plugins/xmms/Makefile plugins/xmms/src/Makefile)
- else
- AC_OUTPUT(libfaad/Makefile frontend/Makefile common/Makefile Makefile plugins/Makefile common/mp4v2/Makefile)
- fi
+if test x$WITHDRM = xyes; then
+ AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
fi
+
+AC_OUTPUT(libfaad/Makefile frontend/Makefile common/Makefile Makefile plugins/Makefile)
--- a/frontend/faad.sln
+++ b/frontend/faad.sln
@@ -1,18 +1,22 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "faad", "faad.vcproj", "{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}"+ ProjectSection(ProjectDependencies) = postProject
+ {F450C38C-0A0D-4531-A17B-A5AF5320C7A7} = {F450C38C-0A0D-4531-A17B-A5AF5320C7A7}+ {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114} = {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\libfaad\libfaad.vcproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4v2_st", "..\common\mp4v2\libmp4v2_st60.vcproj", "{F450C38C-0A0D-4531-A17B-A5AF5320C7A7}"+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.0 = {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}- {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.1 = {F450C38C-0A0D-4531-A17B-A5AF5320C7A7}+ Debug = Debug
+ Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug.ActiveCfg = Debug|Win32--- a/frontend/faad.vcproj
+++ b/frontend/faad.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="faad"
SccProjectName=""
SccLocalPath="">
@@ -20,6 +20,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="<?ICLPrjArgs?> /Qvc7 /Qlocation,link,"$(VCInstallDir)bin" /c /I "../include" /I "../common/mp4v2" /I "../common/faad" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/faad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"C:\Program Files\Intel\Compiler70\ia32\bin;C:\Program Files\Common Files\Intel\Shared Files\ia32\bin;$(VSInstallDir)Common7\IDE" #$LibPath:"C:\Program Files\Intel\Compiler70\ia32\lib;C:\Program Files\Common Files\Intel\Shared Files\ia32\lib" #$IncPath:"C:\Program Files\Intel\Compiler70\ia32\include" <?/IVCSpawnPrjArgs?>"
Optimization="0"
AdditionalIncludeDirectories="../include,../common/mp4v2,../common/faad"
PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
@@ -33,19 +34,12 @@
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
- CompileAs="0">
- <IntelOptions
- Optimization="0"
- MinimalRebuild="1"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/faad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd"/>
- </Tool>
+ CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib""
+ AdditionalOptions="/MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" <?ICLPrjArgs?> /NOLOGO /OUT:".\Debug/faad.exe" /INCREMENTAL ws2_32.lib odbc32.lib odbccp32.lib /DEBUG /PDB:".\Debug/faad.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"C:\Program Files\Intel\Compiler70\ia32\bin;C:\Program Files\Common Files\Intel\Shared Files\ia32\bin;$(VSInstallDir)Common7\IDE" #$LibPath:"C:\Program Files\Intel\Compiler70\ia32\lib;C:\Program Files\Common Files\Intel\Shared Files\ia32\lib" #$IncPath:"C:\Program Files\Intel\Compiler70\ia32\include" <?/IVCSpawnPrjArgs?>"
AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
OutputFile=".\Debug/faad.exe"
LinkIncremental="2"
@@ -52,10 +46,7 @@
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/faad.pdb"
- SubSystem="1">
- <IntelOptions
- AllOptions="/NOLOGO /OUT:".\Debug/faad.exe" /INCREMENTAL ws2_32.lib odbc32.lib odbccp32.lib /DEBUG /PDB:".\Debug/faad.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
- </Tool>
+ SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/faad.tlb"/>
@@ -72,9 +63,13 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
- <IntelOptions
- CompilerName="1"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -86,6 +81,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="<?ICLPrjArgs?> /Qvc7 /Qlocation,link,"$(VCInstallDir)bin" /c /I "../include" /I "../common/mp4v2" /I "../common/faad" /nologo /W3 /O2 /Og /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/faad.pch" /Fo".\Release/" /Fd".\Release/" /Gd <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseIntelTool #$BinPath:"C:\Program Files\Intel\Compiler70\ia32\bin;C:\Program Files\Common Files\Intel\Shared Files\ia32\bin;$(VSInstallDir)Common7\IDE" #$LibPath:"C:\Program Files\Intel\Compiler70\ia32\lib;C:\Program Files\Common Files\Intel\Shared Files\ia32\lib" #$IncPath:"C:\Program Files\Intel\Compiler70\ia32\include" <?/IVCSpawnPrjArgs?>"
GlobalOptimizations="TRUE"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="TRUE"
@@ -103,31 +99,17 @@
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- CompileAs="0">
- <IntelOptions
- Optimization="2"
- GlobalOptimizations="1"
- InlineFuncExpansion="1"
- OmitFramePtrs="1"
- StringPooling="1"
- RuntimeLibrary="0"
- BufferSecurityCheck="1"
- FunctionLevelLinking="1"
- AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /nologo /W3 /O2 /Og /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/faad.pch" /Fo".\Release/" /Fd".\Release/" /Gd"/>
- </Tool>
+ CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" "e:\cvs\audiocoding\faad2\libfaad\Release\libfaad.lib" "e:\cvs\audiocoding\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib""
+ AdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" "e:\cvs\audiocoding\faad2\libfaad\Release\libfaad.lib" "e:\cvs\audiocoding\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib" <?ICLPrjArgs?> /NOLOGO /OUT:".\Release/faad.exe" /INCREMENTAL:NO ws2_32.lib /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseIntelTool #$BinPath:"C:\Program Files\Intel\Compiler70\ia32\bin;C:\Program Files\Common Files\Intel\Shared Files\ia32\bin;$(VSInstallDir)Common7\IDE" #$LibPath:"C:\Program Files\Intel\Compiler70\ia32\lib;C:\Program Files\Common Files\Intel\Shared Files\ia32\lib" #$IncPath:"C:\Program Files\Intel\Compiler70\ia32\include" <?/IVCSpawnPrjArgs?>"
AdditionalDependencies="ws2_32.lib"
OutputFile=".\Release/faad.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- SubSystem="1">
- <IntelOptions
- AllOptions="/NOLOGO /OUT:".\Release/faad.exe" /INCREMENTAL:NO ws2_32.lib /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
- </Tool>
+ SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/faad.tlb"/>
@@ -144,40 +126,57 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
Name="VCWebDeploymentTool"/>
- <IntelOptions
- CompilerName="0"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
- RelativePath=".\audio.c"/>
+ RelativePath=".\audio.c">
+ </File>
<File
- RelativePath="..\common\faad\getopt.c"/>
+ RelativePath="..\common\faad\getopt.c">
+ </File>
<File
- RelativePath=".\main.c"/>
+ RelativePath=".\main.c">
+ </File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
- RelativePath=".\audio.h"/>
+ RelativePath=".\audio.h">
+ </File>
<File
- RelativePath="..\include\faad.h"/>
+ RelativePath="..\include\faad.h">
+ </File>
<File
- RelativePath="..\common\faad\getopt.h"/>
+ RelativePath="..\common\faad\getopt.h">
+ </File>
<File
- RelativePath="..\common\mp4v2\mp4.h"/>
+ RelativePath="..\common\mp4v2\mp4.h">
+ </File>
<File
- RelativePath="..\common\mp4v2\mpeg4ip.h"/>
+ RelativePath="..\common\mp4v2\mpeg4ip.h">
+ </File>
<File
- RelativePath="..\common\mp4v2\systems.h"/>
+ RelativePath="..\common\mp4v2\systems.h">
+ </File>
<File
- RelativePath="..\common\mp4v2\win32_ver.h"/>
+ RelativePath="..\common\mp4v2\win32_ver.h">
+ </File>
</Filter>
</Files>
- <Globals/>
+ <Globals>
+ </Globals>
</VisualStudioProject>
--- a/libfaad/Makefile.am
+++ b/libfaad/Makefile.am
@@ -22,5 +22,6 @@
AM_CFLAGS = -O2 -g
-LDFLAGS = -lm
+LIBTOOL_DEPS =
+LIBS =