[Sumover-dev] [svn commit] r4105 - vic/branches/mpeg4
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Tue Oct 9 12:39:50 BST 2007
Author: piers
Date: Tue Oct 9 12:39:50 2007
New Revision: 4105
Modified:
vic/branches/mpeg4/VERSION
vic/branches/mpeg4/vic.2003.vcproj
Log:
Updated VS.2003 builds for GPL - added missing defines for HAVE_SWSCALE and added back in the STATIC_BUILD to keep compiler quite when linking.
Updated version string generation to include build type (ie release/debug GPL/nonGPL)
Updated version file.
Modified: vic/branches/mpeg4/VERSION
==============================================================================
--- vic/branches/mpeg4/VERSION (original)
+++ vic/branches/mpeg4/VERSION Tue Oct 9 12:39:50 2007
@@ -1 +1 @@
-2.8ucl1.3.0
\ No newline at end of file
+2.8ucl1.3.1
\ No newline at end of file
Modified: vic/branches/mpeg4/vic.2003.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.2003.vcproj (original)
+++ vic/branches/mpeg4/vic.2003.vcproj Tue Oct 9 12:39:50 2007
@@ -151,7 +151,7 @@
<Tool
Name="VCCLCompilerTool"
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"
- PreprocessorDefinitions="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;"..\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"
- PreprocessorDefinitions="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;_WIN95;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;"..\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"
- PreprocessorDefinitions="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"
@@ -333,7 +333,7 @@
<Tool
Name="VCCLCompilerTool"
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"
- PreprocessorDefinitions="NDEBUG;HAVE_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500;NEED_SWSCALE"
+ PreprocessorDefinitions="STATIC_BUILD;NDEBUG;HAVE_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500;HAVE_SWSCALE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
@@ -575,7 +575,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\;codec;render;rtp;net;win32;video;..\common\src;\Tcl\include\tcl8.4;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;codec\h263;win32\ffmpeg"
- PreprocessorDefinitions="NDEBUG;HAVE_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500;NEED_SWSCALE"
+ PreprocessorDefinitions="STATIC_BUILD;NDEBUG;HAVE_INET_PTON;_WINDOWS;SASR;WIN32;ED_YBITS=4;SIGRET=void;SIGARGS=int;NLAYER=8;USE_DDRAW;WINVER=0x500;HAVE_SWSCALE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
@@ -5771,6 +5771,9 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\render\ppm.cpp">
+ </File>
+ <File
RelativePath=".\render\renderer-window.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -6976,7 +6979,8 @@
Name="DDraw Debug GPL|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)""
+ CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)"
+"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -6991,7 +6995,8 @@
Name="DDraw Release GPL|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)""
+ CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)"
+"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
@@ -7021,7 +7026,8 @@
Name="DDraw Release GPL tcltk84|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)""
+ CommandLine="nasmw.exe -f win32 -DPREFIX -o "$(IntDir)\$(InputName).obj" "$(InputPath)"
+"
Outputs="$(IntDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
More information about the Sumover-dev
mailing list