diff options
author | Paweł Kołodziejski | 2004-04-13 05:27:35 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2004-04-13 05:27:35 +0000 |
commit | e42c1f0483b2bf7dd5af4a3473232fa1019618cc (patch) | |
tree | 7d27b2f3077039555ec9f3702aae13bbcacdfb0e | |
parent | 728470074112062584b6ff9298bec2d36697b0a7 (diff) | |
download | scummvm-rg350-e42c1f0483b2bf7dd5af4a3473232fa1019618cc.tar.gz scummvm-rg350-e42c1f0483b2bf7dd5af4a3473232fa1019618cc.tar.bz2 scummvm-rg350-e42c1f0483b2bf7dd5af4a3473232fa1019618cc.zip |
disabled SAGA
svn-id: r13569
-rw-r--r-- | dists/msvc7/saga.vcproj | 30 | ||||
-rw-r--r-- | dists/msvc7/scummvm.sln | 21 | ||||
-rw-r--r-- | dists/msvc7/scummvm.vcproj | 8 |
3 files changed, 11 insertions, 48 deletions
diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj index c5908f85dc..b9f120359a 100644 --- a/dists/msvc7/saga.vcproj +++ b/dists/msvc7/saga.vcproj @@ -97,36 +97,6 @@ </Configuration> </Configurations> <Files> - <File - RelativePath="..\..\saga\binread.cpp"> - </File> - <File - RelativePath="..\..\saga\binread.h"> - </File> - <File - RelativePath="..\..\saga\gamedesc.cpp"> - </File> - <File - RelativePath="..\..\saga\gamedesc.h"> - </File> - <File - RelativePath="..\..\saga\gamedesc_priv.h"> - </File> - <File - RelativePath="..\..\saga\resfile.cpp"> - </File> - <File - RelativePath="..\..\saga\resfile.h"> - </File> - <File - RelativePath="..\..\saga\resnames.h"> - </File> - <File - RelativePath="..\..\saga\saga.cpp"> - </File> - <File - RelativePath="..\..\saga\saga.h"> - </File> </Files> <Globals> </Globals> diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln index c4acb10454..ca8faa3e3e 100644 --- a/dists/msvc7/scummvm.sln +++ b/dists/msvc7/scummvm.sln @@ -13,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "{C8AAE83E-198B-4ECA-A877-166827953979}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}" EndProject Global @@ -23,14 +21,13 @@ Global ConfigName.1 = Release EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {C8AAE83E-198B-4ECA-A877-166827953979} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {6CC3E421-779D-4E80-8100-520886A0F9FF} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} - {8434CB15-D08F-427D-9E6D-581AE5B28440}.7 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {6CC3E421-779D-4E80-8100-520886A0F9FF} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} + {8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {C8AAE83E-198B-4ECA-A877-166827953979} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32 @@ -61,10 +58,6 @@ Global {C8AAE83E-198B-4ECA-A877-166827953979}.Debug.Build.0 = Debug|Win32 {C8AAE83E-198B-4ECA-A877-166827953979}.Release.ActiveCfg = Release|Win32 {C8AAE83E-198B-4ECA-A877-166827953979}.Release.Build.0 = Release|Win32 - {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug.ActiveCfg = Debug|Win32 - {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug.Build.0 = Debug|Win32 - {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.ActiveCfg = Release|Win32 - {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.Build.0 = Release|Win32 {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug.ActiveCfg = Debug|Win32 {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug.Build.0 = Debug|Win32 {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release.ActiveCfg = Release|Win32 diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 5840514990..2ee0eba92f 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.vcproj @@ -21,7 +21,7 @@ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" Optimization="0" AdditionalIncludeDirectories="../../;../../common" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;DISABLE_SAGA" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -39,7 +39,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib libz.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib saga_debug/saga.lib kyra_debug/kyra.lib queen_debug/queen.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib libz.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib queen_debug/queen.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -76,7 +76,7 @@ InlineFunctionExpansion="1" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../common" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;DISABLE_SAGA" StringPooling="TRUE" MinimalRebuild="FALSE" ExceptionHandling="TRUE" @@ -93,7 +93,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib libz.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_release/sword1.lib sword2_release/sword2.lib saga_release/saga.lib kyra_release/kyra.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib libz.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" |