[Scummvm-cvs-logs] SF.net SVN: scummvm:[38363] scummvm/trunk/dists
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Feb 16 11:14:58 CET 2009
Revision: 38363
http://scummvm.svn.sourceforge.net/scummvm/?rev=38363&view=rev
Author: thebluegr
Date: 2009-02-16 10:14:58 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
Sync
Modified Paths:
--------------
scummvm/trunk/dists/msvc7/agi.vcproj
scummvm/trunk/dists/msvc7/agos.vcproj
scummvm/trunk/dists/msvc7/drascula.vcproj
scummvm/trunk/dists/msvc7/igor.vcproj
scummvm/trunk/dists/msvc7/lure.vcproj
scummvm/trunk/dists/msvc7/m4.vcproj
scummvm/trunk/dists/msvc7/made.vcproj
scummvm/trunk/dists/msvc7/parallaction.vcproj
scummvm/trunk/dists/msvc7/queen.vcproj
scummvm/trunk/dists/msvc7/sci.vcproj
scummvm/trunk/dists/msvc7/scumm.vcproj
scummvm/trunk/dists/msvc7/scummvm.sln
scummvm/trunk/dists/msvc7/scummvm.vcproj
scummvm/trunk/dists/msvc7/sword2.vcproj
scummvm/trunk/dists/msvc7/touche.vcproj
scummvm/trunk/dists/msvc71/agi.vcproj
scummvm/trunk/dists/msvc71/agos.vcproj
scummvm/trunk/dists/msvc71/drascula.vcproj
scummvm/trunk/dists/msvc71/igor.vcproj
scummvm/trunk/dists/msvc71/lure.vcproj
scummvm/trunk/dists/msvc71/m4.vcproj
scummvm/trunk/dists/msvc71/made.vcproj
scummvm/trunk/dists/msvc71/parallaction.vcproj
scummvm/trunk/dists/msvc71/queen.vcproj
scummvm/trunk/dists/msvc71/sci.vcproj
scummvm/trunk/dists/msvc71/scumm.vcproj
scummvm/trunk/dists/msvc71/scummvm.sln
scummvm/trunk/dists/msvc71/scummvm.vcproj
scummvm/trunk/dists/msvc71/sword2.vcproj
scummvm/trunk/dists/msvc71/touche.vcproj
scummvm/trunk/dists/msvc8/sci.vcproj
scummvm/trunk/dists/msvc8/scummvm.sln
scummvm/trunk/dists/msvc8/scummvm.vcproj
Modified: scummvm/trunk/dists/msvc7/agi.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/agi.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/agi.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="agi"
ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/agos.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/agos.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/agos.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="agos"
ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/drascula.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/drascula.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="drascula"
ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/igor.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/igor.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/igor.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="igor"
ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/lure.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/lure.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/lure.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="lure"
ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/m4.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/m4.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/m4.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="m4"
ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/made.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/made.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/made.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="made"
ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/parallaction.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/parallaction.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/parallaction.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="parallaction"
ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/queen.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/queen.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/queen.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="queen"
ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/sci.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/sci.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -22,7 +22,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
StringPooling="TRUE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
@@ -303,9 +303,6 @@
RelativePath="..\..\engines\sci\scicore\int_hashmap.cpp">
</File>
<File
- RelativePath="..\..\engines\sci\scicore\reg_t_hashmap.cpp">
- </File>
- <File
RelativePath="..\..\engines\sci\scicore\resource.cpp">
</File>
<File
@@ -525,12 +522,6 @@
RelativePath="..\..\engines\sci\include\menubar.h">
</File>
<File
- RelativePath="..\..\engines\sci\include\old_objects.h">
- </File>
- <File
- RelativePath="..\..\engines\sci\include\reg_t_hashmap.h">
- </File>
- <File
RelativePath="..\..\engines\sci\include\resource.h">
</File>
<File
Modified: scummvm/trunk/dists/msvc7/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/scumm.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/scumm.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="scumm"
ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/scummvm.sln
===================================================================
--- scummvm/trunk/dists/msvc7/scummvm.sln 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/scummvm.sln 2009-02-16 10:14:58 UTC (rev 38363)
@@ -69,6 +69,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "groovie", "groovie.vcproj", "{2C1EA540-0B09-11DD-BD00-000000000000}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -167,6 +169,10 @@
{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: scummvm/trunk/dists/msvc7/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/scummvm.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/scummvm.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -22,7 +22,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
StringPooling="TRUE"
MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
@@ -98,7 +98,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: scummvm/trunk/dists/msvc7/sword2.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/sword2.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/sword2.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="sword2"
ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc7/touche.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/touche.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc7/touche.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7,00"
Name="touche"
ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/agi.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/agi.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/agi.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="agi"
ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/agos.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/agos.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/agos.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="agos"
ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/drascula.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/drascula.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="drascula"
ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/igor.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/igor.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/igor.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="igor"
ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/lure.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/lure.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/lure.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="lure"
ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/m4.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/m4.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/m4.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="m4"
ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/made.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/made.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/made.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="made"
ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/parallaction.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/parallaction.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/parallaction.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="parallaction"
ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/queen.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/queen.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/queen.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="queen"
ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/sci.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/sci.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -22,7 +22,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -76,7 +76,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
StringPooling="TRUE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
@@ -317,9 +317,6 @@
RelativePath="..\..\engines\sci\scicore\int_hashmap.cpp">
</File>
<File
- RelativePath="..\..\engines\sci\scicore\reg_t_hashmap.cpp">
- </File>
- <File
RelativePath="..\..\engines\sci\scicore\resource.cpp">
</File>
<File
@@ -539,12 +536,6 @@
RelativePath="..\..\engines\sci\include\menubar.h">
</File>
<File
- RelativePath="..\..\engines\sci\include\old_objects.h">
- </File>
- <File
- RelativePath="..\..\engines\sci\include\reg_t_hashmap.h">
- </File>
- <File
RelativePath="..\..\engines\sci\include\resource.h">
</File>
<File
Modified: scummvm/trunk/dists/msvc71/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scumm.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/scumm.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="scumm"
ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/scummvm.sln
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.sln 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/scummvm.sln 2009-02-16 10:14:58 UTC (rev 38363)
@@ -113,6 +113,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -211,6 +215,10 @@
{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: scummvm/trunk/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/scummvm.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -22,7 +22,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -86,7 +86,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
StringPooling="TRUE"
MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
@@ -104,7 +104,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: scummvm/trunk/dists/msvc71/sword2.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/sword2.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/sword2.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="sword2"
ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc71/touche.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/touche.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc71/touche.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="7,10"
Name="touche"
ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
Keyword="Win32Proj">
Modified: scummvm/trunk/dists/msvc8/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sci.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc8/sci.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -43,7 +43,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -725,14 +725,6 @@
>
</File>
<File
- RelativePath="..\..\engines\sci\include\old_objects.h"
- >
- </File>
- <File
- RelativePath="..\..\engines\sci\include\reg_t_hashmap.h"
- >
- </File>
- <File
RelativePath="..\..\engines\sci\include\resource.h"
>
</File>
Modified: scummvm/trunk/dists/msvc8/scummvm.sln
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.sln 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc8/scummvm.sln 2009-02-16 10:14:58 UTC (rev 38363)
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
ProjectSection(ProjectDependencies) = postProject
{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
@@ -70,6 +70,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "groovie", "groovie.vcproj", "{2C1EA540-0B09-11DD-BD00-000000000000}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -168,6 +170,10 @@
{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
+ {53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj 2009-02-16 09:53:34 UTC (rev 38362)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj 2009-02-16 10:14:58 UTC (rev 38363)
@@ -43,7 +43,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib cruise_debug/cruise.lib igor_debug/igor.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib sci_debug/sci.lib parallaction_debug/parallaction.lib m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib tucker_Debug/tucker.lib groovie_Debug/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -135,7 +135,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
StringPooling="true"
MinimalRebuild="false"
ExceptionHandling="1"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
+ AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sci_release/sci.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib tucker_release/tucker.lib groovie_release/groovie.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list