diff options
author | Filippos Karapetis | 2009-02-16 10:14:58 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-02-16 10:14:58 +0000 |
commit | 271758dbb8c3f70bb875d4629c36902e20965b10 (patch) | |
tree | ad6b39ad9ec4cba7787a7a6c8be6b4df775cc3f9 /dists/msvc7 | |
parent | a27262621045b1770c3fc0e01c1a9b369a7df877 (diff) | |
download | scummvm-rg350-271758dbb8c3f70bb875d4629c36902e20965b10.tar.gz scummvm-rg350-271758dbb8c3f70bb875d4629c36902e20965b10.tar.bz2 scummvm-rg350-271758dbb8c3f70bb875d4629c36902e20965b10.zip |
Sync
svn-id: r38363
Diffstat (limited to 'dists/msvc7')
-rw-r--r-- | dists/msvc7/agi.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/agos.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/drascula.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/igor.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/lure.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/m4.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/made.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/parallaction.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/queen.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/sci.vcproj | 13 | ||||
-rw-r--r-- | dists/msvc7/scumm.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/scummvm.sln | 6 | ||||
-rw-r--r-- | dists/msvc7/scummvm.vcproj | 8 | ||||
-rw-r--r-- | dists/msvc7/sword2.vcproj | 2 | ||||
-rw-r--r-- | dists/msvc7/touche.vcproj | 2 |
15 files changed, 24 insertions, 27 deletions
diff --git a/dists/msvc7/agi.vcproj b/dists/msvc7/agi.vcproj index 7da2e9397d..1bbeeb0364 100644 --- a/dists/msvc7/agi.vcproj +++ b/dists/msvc7/agi.vcproj @@ -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"> diff --git a/dists/msvc7/agos.vcproj b/dists/msvc7/agos.vcproj index 5aad20fa99..80442fc46d 100644 --- a/dists/msvc7/agos.vcproj +++ b/dists/msvc7/agos.vcproj @@ -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"> diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj index 7d4d55b00c..70f51b89c3 100644 --- a/dists/msvc7/drascula.vcproj +++ b/dists/msvc7/drascula.vcproj @@ -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"> diff --git a/dists/msvc7/igor.vcproj b/dists/msvc7/igor.vcproj index 46af401294..1f25143030 100644 --- a/dists/msvc7/igor.vcproj +++ b/dists/msvc7/igor.vcproj @@ -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"> diff --git a/dists/msvc7/lure.vcproj b/dists/msvc7/lure.vcproj index 3e772218bc..af6c4ebc23 100644 --- a/dists/msvc7/lure.vcproj +++ b/dists/msvc7/lure.vcproj @@ -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"> diff --git a/dists/msvc7/m4.vcproj b/dists/msvc7/m4.vcproj index 43a563abae..d4c700db0e 100644 --- a/dists/msvc7/m4.vcproj +++ b/dists/msvc7/m4.vcproj @@ -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"> diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj index f0bec886ca..922658c318 100644 --- a/dists/msvc7/made.vcproj +++ b/dists/msvc7/made.vcproj @@ -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"> diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj index 6547c6ccf6..61fc741160 100644 --- a/dists/msvc7/parallaction.vcproj +++ b/dists/msvc7/parallaction.vcproj @@ -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"> diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj index bc8987ec9d..afc0aa17e3 100644 --- a/dists/msvc7/queen.vcproj +++ b/dists/msvc7/queen.vcproj @@ -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"> diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj index 1456d41f8d..b609405022 100644 --- a/dists/msvc7/sci.vcproj +++ b/dists/msvc7/sci.vcproj @@ -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 diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj index 397d6ef68b..1766f4e211 100644 --- a/dists/msvc7/scumm.vcproj +++ b/dists/msvc7/scumm.vcproj @@ -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"> diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln index 50fb0cacb4..3e60b5b48c 100644 --- a/dists/msvc7/scummvm.sln +++ b/dists/msvc7/scummvm.sln @@ -69,6 +69,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tucker", "tucker.vcproj", " 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 @@ Global {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 diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 58f2f74d9f..170699b143 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.vcproj @@ -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" diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj index c852510087..5da67dda34 100644 --- a/dists/msvc7/sword2.vcproj +++ b/dists/msvc7/sword2.vcproj @@ -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"> diff --git a/dists/msvc7/touche.vcproj b/dists/msvc7/touche.vcproj index 983e848226..52fc1d2d91 100644 --- a/dists/msvc7/touche.vcproj +++ b/dists/msvc7/touche.vcproj @@ -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"> |