[Sumover-dev] [svn commit] r4746 - vic/branches/mpeg4
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Tue Mar 30 12:02:03 BST 2010
Author: piers
Date: Tue Mar 30 12:02:03 2010
New Revision: 4746
Modified:
vic/branches/mpeg4/vic.2008.vcproj
Log:
Added local (ie in VIC dir) include/lib paths for ffmpeg and x264 - Whilst one can install them in to the minge tree - since we need specific versions of x264/ffmpeg it maybe cleaner to keep them internal - as is done in the UNIX versions. This makes them more similar as one can now run ./configure on windows which will install and configure x264/ffmpeg.
Modified: vic/branches/mpeg4/vic.2008.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.2008.vcproj (original)
+++ vic/branches/mpeg4/vic.2008.vcproj Tue Mar 30 12:02:03 2010
@@ -221,7 +221,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;C:\Tcl\include\tcl8.5;C:\msys\1.0\local\include;C:\msys\local\include;c:\mingw\local\include;"$(DXSDK_DIR)\include""
+ AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;x264\include;ffmpeg\include;C:\Tcl\include\tcl8.5;C:\msys\1.0\local\include;C:\msys\local\include;c:\mingw\local\include;"$(DXSDK_DIR)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_IPv6;USE_ZVFS;USE_DDRAW;HAVE_SWSCALE;HAVE_STDLIB_H;SASR;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_WINNT=_WIN32_WINNT_WINXP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -241,9 +241,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
+ AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.lib libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Tcl\lib;"$(DXSDK_DIR)\Lib\x86";C:\msys\1.0\lib;"C:\mingw\lib\gcc\mingw32\4.2.1-sjlj";c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;"$(SolutionDir)Debug";C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"
+ AdditionalLibraryDirectories="C:\Tcl\lib;ffmpeg\lib;x264\lib;"$(DXSDK_DIR)\Lib\x86";C:\msys\1.0\lib;"C:\mingw\lib\gcc\mingw32\4.2.1-sjlj";c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;"$(SolutionDir)Debug";C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"
IgnoreDefaultLibraryNames="MSVCRTD.lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -308,7 +308,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;C:\Tcl\include\tcl8.5;C:\msys\1.0\local\include;C:\msys\local\include;"$(DXSDK_DIR)\include""
+ AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;x264\include;ffmpeg\include;C:\Tcl\include\tcl8.5;C:\msys\1.0\local\include;C:\msys\local\include;"$(DXSDK_DIR)\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_IPv6;USE_ZVFS;USE_DDRAW;HAVE_SWSCALE;HAVE_STDLIB_H;SASR;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_WINNT=_WIN32_WINNT_WINXP"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -327,10 +327,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
+ AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.lib libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Tcl\lib;"$(DXSDK_DIR)\Lib\x86";C:\msys\1.0\lib;"C:\mingw\lib\gcc\mingw32\4.2.1-sjlj";c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;"$(SolutionDir)Release";C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"
- IgnoreDefaultLibraryNames=""
+ AdditionalLibraryDirectories="C:\Tcl\lib;x264\lib;ffmpeg\lib;"$(DXSDK_DIR)\Lib\x86";C:\msys\1.0\lib;"C:\mingw\lib\gcc\mingw32\4.2.1-sjlj";c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;"$(SolutionDir)Release";C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"
+ IgnoreDefaultLibraryNames="MSVCRTD.lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
More information about the Sumover-dev
mailing list