[Sumover-dev] [svn commit] r4462 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Jun  4 16:28:47 2009
New Revision: 4462

Modified:
   vic/branches/mpeg4/vic.2008.vcproj

Log:
Updated with x264 and ffmpeg paths so that it looks in win32/lib and win32/include directories (which are populated by running 'make install' on x264 and ffmpeg (see updated win32/build_install.txt)

Modified: vic/branches/mpeg4/vic.2008.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.2008.vcproj	(original)
+++ vic/branches/mpeg4/vic.2008.vcproj	Thu Jun  4 16:28:47 2009
@@ -324,7 +324,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="       "
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;"..\tk-8.0\win";"..\tk-8.0\generic";"..\tk-8.0\xlib";"..\tcl-8.0\win";"..\tcl-8.0\generic";codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;codec\h263;win32\ffmpeg;"C:\Program Files\Microsoft DirectX SDK (March 2008)\Include";$(NOINHERIT)"
+				AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;"..\tk-8.0\win";"..\tk-8.0\generic";"..\tk-8.0\xlib";"..\tcl-8.0\win";"..\tcl-8.0\generic";codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;codec\h263;win32\include;"C:\Program Files\Microsoft DirectX SDK (March 2008)\Include";$(NOINHERIT)"
 				PreprocessorDefinitions="STATIC_BUILD;DEBUG;_DEBUG;NEED_INET_PTON;_WINDOWS;SASR;WIN32;HAVE_SWSCALE;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500, HAVE_STDLIB_H"
 				RuntimeLibrary="1"
 				StructMemberAlignment="5"
@@ -350,11 +350,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="tklib.lib tcllib.lib uclmm.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib ddraw.lib dxguid.lib iphlpapi.lib strmiids.lib quartz.lib avcodec-51.lib avutil-49.lib swscale-0.lib postproc-51.lib libx264.lib"
+				AdditionalDependencies="tklib.lib tcllib.lib uclmm.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib ddraw.lib dxguid.lib iphlpapi.lib strmiids.lib quartz.lib avcodec-52.lib avutil-49.lib swscale-0.lib postproc-51.lib libx264.lib"
 				OutputFile=".\DDraw_Debug/vic.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\common\src\Debug;&quot;..\tcl-8.0\win\Debug&quot;;&quot;..\tk-8.0\win\Debug&quot;;codec\tmndec;&quot;codec\tmn-x&quot;;\mssdk\lib;&quot;C:\Program Files\Intel\plsuite\lib\msvc&quot;;&quot;C:\Program Files\Intel\plsuite\lib&quot;;win32\lib"
+				AdditionalLibraryDirectories="..\common\src\Debug;&quot;..\tcl-8.0\win\Debug&quot;;&quot;..\tk-8.0\win\Debug&quot;;codec\tmndec;&quot;codec\tmn-x&quot;;\mssdk\lib;&quot;C:\Program Files\Intel\plsuite\lib\msvc&quot;;&quot;C:\Program Files\Intel\plsuite\lib&quot;;win32\lib;ffmpeg;x264"
 				IgnoreDefaultLibraryNames="libcd.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"