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

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

Author: piers
Date: Wed Oct 17 12:45:54 2007
New Revision: 4109

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

Log:
Tweaked  DDraw Release GPL build to exclude color-true.cpp renderer - it should not be used in teh GPL build as the color-swscale.cpp renderer takes care of all rendering.

Modified: vic/branches/mpeg4/vic.2003.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.2003.vcproj	(original)
+++ vic/branches/mpeg4/vic.2003.vcproj	Wed Oct 17 12:45:54 2007
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;&quot;..\tk-8.0\win&quot;;&quot;..\tk-8.0\generic&quot;;&quot;..\tk-8.0\xlib&quot;;&quot;..\tcl-8.0\win&quot;;&quot;..\tcl-8.0\generic&quot;;codec\tmndec;&quot;codec\tmn-x&quot;;codec\jpeg;codec\p64;codec\h263"
-				PreprocessorDefinitions="STATIC_BUILD;NDEBUG,HAVE_INET_PTON,_WINDOWS,SASR,WIN32,ED_YBITS=4,SIGRET=void,SIGARGS=int,NLAYER=8,USE_DDRAW,WINVER=0x500"
+				PreprocessorDefinitions="STATIC_BUILD;NDEBUG;HAVE_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
@@ -213,7 +213,7 @@
 				AdditionalOptions="       "
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;&quot;..\tk-8.0\win&quot;;&quot;..\tk-8.0\generic&quot;;&quot;..\tk-8.0\xlib&quot;;&quot;..\tcl-8.0\win&quot;;&quot;..\tcl-8.0\generic&quot;;codec\tmndec;&quot;codec\tmn-x&quot;;codec\jpeg;codec\p64;codec\h263;win32\ffmpeg"
-				PreprocessorDefinitions="STATIC_BUILD;DEBUG;_DEBUG;_WIN95;NEED_INET_PTON;_WINDOWS;SASR;WIN32;HAVE_SWSCALE;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500"
+				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"
 				RuntimeLibrary="5"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
@@ -273,7 +273,7 @@
 				AdditionalOptions="       "
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;&quot;..\tk-8.0\win&quot;;&quot;..\tk-8.0\generic&quot;;&quot;..\tk-8.0\xlib&quot;;&quot;..\tcl-8.0\win&quot;;&quot;..\tcl-8.0\generic&quot;;codec\tmndec;&quot;codec\tmn-x&quot;;codec\jpeg;codec\p64;codec\h263"
-				PreprocessorDefinitions="STATIC_BUILD;DEBUG,_DEBUG,_WIN95,NEED_INET_PTON,_WINDOWS,SASR,WIN32,ED_YBITS=4,SIGRET=void,SIGARGS=int,NLAYER=8,USE_DDRAW,WINVER=0x500"
+				PreprocessorDefinitions="STATIC_BUILD;DEBUG;_DEBUG;_WIN95;NEED_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -2271,6 +2271,14 @@
 			<File
 				RelativePath=".\tcl\ui-titlemaker.tcl">
 				<FileConfiguration
+					Name="DDraw Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="tcl\tcl2cpp\tcl2cpp 2 $(InputPath)  &gt; tcl\generated\$(InputName).cpp
+"
+						Outputs="tcl\generated\$(InputName).cpp"/>
+				</FileConfiguration>
+				<FileConfiguration
 					Name="DDraw Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
@@ -5701,6 +5709,12 @@
 						AdditionalOptions="               "/>
 				</FileConfiguration>
 				<FileConfiguration
+					Name="DDraw Release GPL|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
 					Name="DDraw Debug tcltk84|Win32">
 					<Tool
 						Name="VCCLCompilerTool"