[Scummvm-cvs-logs] SF.net SVN: scummvm: [31349] scummvm/trunk/dists/msvc71
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Apr 1 11:21:05 CEST 2008
Revision: 31349
http://scummvm.svn.sourceforge.net/scummvm/?rev=31349&view=rev
Author: thebluegr
Date: 2008-04-01 02:21:05 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
Updated MSVC71 project files using the new MSVC project file conversion tool
Modified Paths:
--------------
scummvm/trunk/dists/msvc71/agi.vcproj
scummvm/trunk/dists/msvc71/agos.vcproj
scummvm/trunk/dists/msvc71/cine.vcproj
scummvm/trunk/dists/msvc71/cruise.vcproj
scummvm/trunk/dists/msvc71/drascula.vcproj
scummvm/trunk/dists/msvc71/gob.vcproj
scummvm/trunk/dists/msvc71/igor.vcproj
scummvm/trunk/dists/msvc71/kyra.vcproj
scummvm/trunk/dists/msvc71/lure.vcproj
scummvm/trunk/dists/msvc71/parallaction.vcproj
scummvm/trunk/dists/msvc71/queen.vcproj
scummvm/trunk/dists/msvc71/saga.vcproj
scummvm/trunk/dists/msvc71/scumm.vcproj
scummvm/trunk/dists/msvc71/scummvm.sln
scummvm/trunk/dists/msvc71/scummvm.vcproj
scummvm/trunk/dists/msvc71/sky.vcproj
scummvm/trunk/dists/msvc71/sword1.vcproj
scummvm/trunk/dists/msvc71/sword2.vcproj
scummvm/trunk/dists/msvc71/touche.vcproj
Modified: scummvm/trunk/dists/msvc71/agi.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/agi.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/agi.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="Windows-1250"?>
+<?xml version="1.0" encoding="windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="agi"
- ProjectGUID="{15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}"
+ ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -70,7 +70,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="../..;../../engines"
+ AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
StringPooling="TRUE"
ExceptionHandling="TRUE"
Modified: scummvm/trunk/dists/msvc71/agos.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/agos.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/agos.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -62,7 +62,6 @@
OutputDirectory="agos_Release"
IntermediateDirectory="agos_Release"
ConfigurationType="4"
- ATLMinimizesCRunTimeLibraryUsage="TRUE"
CharacterSet="2"
WholeProgramOptimization="FALSE">
<Tool
@@ -78,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/cine.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/cine.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/cine.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="cine"
- ProjectGUID="{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}"
+ ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/cruise.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/cruise.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/cruise.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="Windows-1250"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="cruise"
- ProjectGUID="{CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}"
+ ProjectGUID="{8863B00B-059A-471E-876D-A955ECEFD0D2}"
Keyword="Win32Proj">
<Platforms>
<Platform
Modified: scummvm/trunk/dists/msvc71/drascula.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/drascula.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/drascula.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -70,7 +70,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="../..;../../engines"
+ AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
StringPooling="TRUE"
ExceptionHandling="TRUE"
Modified: scummvm/trunk/dists/msvc71/gob.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/gob.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/gob.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="gob"
- ProjectGUID="{AA83E230-EC4A-44DF-896C-4472F20CE168}"
+ ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/igor.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/igor.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/igor.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -4,7 +4,6 @@
Version="7.10"
Name="igor"
ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
- RootNamespace="igor"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -71,13 +70,14 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="../..;../../engines"
+ AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
StringPooling="TRUE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
@@ -111,8 +111,7 @@
</References>
<Files>
<Filter
- Name="parts"
- Filter="">
+ Name="parts">
<File
RelativePath="..\..\engines\igor\parts\part_04.cpp">
</File>
Modified: scummvm/trunk/dists/msvc71/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/kyra.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/kyra.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
@@ -128,12 +129,24 @@
RelativePath="..\..\engines\kyra\detection.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\gui.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\gui.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\gui_v1.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\gui_v1.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\gui_v2.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\gui_v2.h">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\items_v1.cpp">
</File>
<File
@@ -170,9 +183,15 @@
RelativePath="..\..\engines\kyra\resource.h">
</File>
<File
+ RelativePath="..\..\engines\kyra\saveload.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\saveload_v1.cpp">
</File>
<File
+ RelativePath="..\..\engines\kyra\saveload_v2.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\scene.cpp">
</File>
<File
Modified: scummvm/trunk/dists/msvc71/lure.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/lure.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/lure.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="lure"
- ProjectGUID="{04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}"
+ ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/parallaction.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/parallaction.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/parallaction.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -4,7 +4,6 @@
Version="7.10"
Name="parallaction"
ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
- RootNamespace="parallaction"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -71,13 +70,14 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="../..;../../engines"
+ AdditionalIncludeDirectories="../../;../../engines"
PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
StringPooling="TRUE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/queen.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/queen.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/queen.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/saga.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/saga.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/saga.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scumm.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/scumm.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -15,8 +15,7 @@
OutputDirectory="scumm_Debug"
IntermediateDirectory="scumm_Debug"
ConfigurationType="4"
- CharacterSet="2"
- WholeProgramOptimization="FALSE">
+ CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
@@ -112,8 +111,7 @@
</References>
<Files>
<Filter
- Name="smush"
- Filter="">
+ Name="smush">
<File
RelativePath="..\..\engines\scumm\smush\channel.cpp">
</File>
@@ -127,6 +125,9 @@
RelativePath="..\..\engines\scumm\smush\chunk.h">
</File>
<File
+ RelativePath="..\..\engines\scumm\smush\chunk_type.h">
+ </File>
+ <File
RelativePath="..\..\engines\scumm\smush\codec1.cpp">
</File>
<File
@@ -167,8 +168,7 @@
</File>
</Filter>
<Filter
- Name="imuse_digi"
- Filter="">
+ Name="imuse_digi">
<File
RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
</File>
@@ -200,12 +200,17 @@
RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
</File>
<File
+ RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h">
+ </File>
+ <File
RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
</File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h">
+ </File>
</Filter>
<Filter
- Name="insane"
- Filter="">
+ Name="insane">
<File
RelativePath="..\..\engines\scumm\insane\insane.cpp">
</File>
@@ -226,43 +231,8 @@
</File>
</Filter>
<Filter
- Name="imuse"
- Filter="">
+ Name="he">
<File
- RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\imuse.h">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\instrument.h">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\sysex.h">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
- </File>
- <File
- RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
- </File>
- </Filter>
- <Filter
- Name="he"
- Filter="">
- <File
RelativePath="..\..\engines\scumm\he\animation_he.cpp">
</File>
<File
@@ -338,6 +308,39 @@
RelativePath="..\..\engines\scumm\he\wiz_he.h">
</File>
</Filter>
+ <Filter
+ Name="imuse">
+ <File
+ RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\imuse.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\instrument.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\sysex.h">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
+ </File>
+ </Filter>
<File
RelativePath="..\..\engines\scumm\actor.cpp">
</File>
Modified: scummvm/trunk/dists/msvc71/scummvm.sln
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.sln 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/scummvm.sln 2008-04-01 09:21:05 UTC (rev 31349)
@@ -1,23 +1,23 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
ProjectSection(ProjectDependencies) = postProject
- {43C2D921-FEE3-40BE-B58A-A6CA34235731} = {43C2D921-FEE3-40BE-B58A-A6CA34235731}
{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
- {AA83E230-EC4A-44DF-896C-4472F20CE168} = {AA83E230-EC4A-44DF-896C-4472F20CE168}
- {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC} = {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}
- {C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
- {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
- {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
- {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A} = {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}
- {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
- {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4} = {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}
+ {83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
+ {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
+ {8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
+ {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
- {83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
- {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+ {976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
+ {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+ {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
+ {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+ {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+ {D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
+ {1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
+ {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+ {C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
- {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE} = {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
@@ -52,23 +52,23 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{AA83E230-EC4A-44DF-896C-4472F20CE168}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D947A-A45F-4437-991E-412F695C64C7}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{43C2D921-FEE3-40BE-B58A-A6CA34235731}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{D4986356-D0BB-4981-924A-854157BDF11F}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
@@ -76,7 +76,7 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{8863B00B-059A-471E-876D-A955ECEFD0D2}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
@@ -94,80 +94,81 @@
Release = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
+ {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.Build.0 = Debug|Win32
+ {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32
+ {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32
+ {6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.Build.0 = Debug|Win32
+ {6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.ActiveCfg = Release|Win32
+ {6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.Build.0 = Release|Win32
+ {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.Build.0 = Debug|Win32
+ {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.ActiveCfg = Release|Win32
+ {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.Build.0 = Release|Win32
+ {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32
+ {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32
+ {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32
+ {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.Build.0 = Debug|Win32
+ {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.ActiveCfg = Release|Win32
+ {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.Build.0 = Release|Win32
+ {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.Build.0 = Debug|Win32
+ {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.ActiveCfg = Release|Win32
+ {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.Build.0 = Release|Win32
+ {C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.Build.0 = Debug|Win32
+ {C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.ActiveCfg = Release|Win32
+ {C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.Build.0 = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32
+ {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.Build.0 = Debug|Win32
+ {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.ActiveCfg = Release|Win32
+ {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.Build.0 = Release|Win32
+ {976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.Build.0 = Debug|Win32
+ {976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.ActiveCfg = Release|Win32
+ {976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.Build.0 = Release|Win32
+ {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.Build.0 = Debug|Win32
+ {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.ActiveCfg = Release|Win32
+ {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.Build.0 = Release|Win32
+ {1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.Build.0 = Debug|Win32
+ {1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.ActiveCfg = Release|Win32
+ {1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.Build.0 = Release|Win32
+ {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.Build.0 = Debug|Win32
+ {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.ActiveCfg = Release|Win32
+ {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.Build.0 = Release|Win32
+ {D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.Build.0 = Debug|Win32
+ {D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.ActiveCfg = Release|Win32
+ {D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.Build.0 = Release|Win32
+ {0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.Build.0 = Debug|Win32
+ {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.ActiveCfg = Release|Win32
+ {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.Build.0 = Release|Win32
+ {8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.Build.0 = Debug|Win32
+ {8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.ActiveCfg = Release|Win32
+ {8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.Build.0 = Release|Win32
+ {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.Build.0 = Debug|Win32
+ {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.ActiveCfg = Release|Win32
+ {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.Build.0 = Release|Win32
+ {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.Build.0 = Debug|Win32
+ {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.ActiveCfg = Release|Win32
+ {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.Build.0 = Debug|Win32
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release.ActiveCfg = Release|Win32
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.Release.Build.0 = Release|Win32
- {6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug.ActiveCfg = Debug|Win32
- {6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug.Build.0 = Debug|Win32
- {6CC3E421-779D-4E80-8100-520886A0F9FF}.Release.ActiveCfg = Release|Win32
- {6CC3E421-779D-4E80-8100-520886A0F9FF}.Release.Build.0 = Release|Win32
- {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug.ActiveCfg = Debug|Win32
- {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug.Build.0 = Debug|Win32
- {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release.ActiveCfg = Release|Win32
- {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release.Build.0 = Release|Win32
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug.ActiveCfg = Debug|Win32
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug.Build.0 = Debug|Win32
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release.ActiveCfg = Release|Win32
- {B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release.Build.0 = Release|Win32
- {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug.ActiveCfg = Debug|Win32
- {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug.Build.0 = Debug|Win32
- {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release.ActiveCfg = Release|Win32
- {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release.Build.0 = Release|Win32
- {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug.ActiveCfg = Debug|Win32
- {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug.Build.0 = Debug|Win32
- {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release.ActiveCfg = Release|Win32
- {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release.Build.0 = Release|Win32
- {C8AAE83E-198B-4ECA-A877-166827953979}.Debug.ActiveCfg = Debug|Win32
- {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
- {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
- {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.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
- {AA83E230-EC4A-44DF-896C-4472F20CE168}.Debug.ActiveCfg = Debug|Win32
- {AA83E230-EC4A-44DF-896C-4472F20CE168}.Debug.Build.0 = Debug|Win32
- {AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.ActiveCfg = Release|Win32
- {AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.Build.0 = Release|Win32
- {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Debug.ActiveCfg = Debug|Win32
- {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Debug.Build.0 = Debug|Win32
- {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Release.ActiveCfg = Release|Win32
- {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Release.Build.0 = Release|Win32
- {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}.Debug.ActiveCfg = Debug|Win32
- {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}.Debug.Build.0 = Debug|Win32
- {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}.Release.ActiveCfg = Release|Win32
- {04D6E063-ECA3-4D4E-BD19-BA5C9165A44A}.Release.Build.0 = Release|Win32
- {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}.Debug.ActiveCfg = Debug|Win32
- {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}.Debug.Build.0 = Debug|Win32
- {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}.Release.ActiveCfg = Release|Win32
- {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}.Release.Build.0 = Release|Win32
- {43C2D921-FEE3-40BE-B58A-A6CA34235731}.Debug.ActiveCfg = Debug|Win32
- {43C2D921-FEE3-40BE-B58A-A6CA34235731}.Debug.Build.0 = Debug|Win32
- {43C2D921-FEE3-40BE-B58A-A6CA34235731}.Release.ActiveCfg = Release|Win32
- {43C2D921-FEE3-40BE-B58A-A6CA34235731}.Release.Build.0 = Release|Win32
- {0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug.ActiveCfg = Debug|Win32
- {0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug.Build.0 = Debug|Win32
- {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release.ActiveCfg = Release|Win32
- {0068957B-E2E1-4988-8C87-D541D84DAF20}.Release.Build.0 = Release|Win32
- {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Debug.ActiveCfg = Debug|Win32
- {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Debug.Build.0 = Debug|Win32
- {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Release.ActiveCfg = Release|Win32
- {CD9AEE36-CEBD-40CE-A6B3-B71523AB8DEC}.Release.Build.0 = Release|Win32
- {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug.ActiveCfg = Debug|Win32
- {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug.Build.0 = Debug|Win32
- {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release.ActiveCfg = Release|Win32
- {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release.Build.0 = Release|Win32
- {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug.ActiveCfg = Debug|Win32
- {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug.Build.0 = Debug|Win32
- {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release.ActiveCfg = Release|Win32
- {83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release.Build.0 = Release|Win32
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: scummvm/trunk/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/scummvm.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -38,10 +38,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib touche_debug/touche.lib parallaction_debug/parallaction.lib cruise_debug/cruise.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 parallaction_debug/parallaction.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="2"
- IgnoreDefaultLibraryNames="libcmtd.lib"
+ IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
SubSystem="1"
@@ -62,8 +62,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -82,13 +80,14 @@
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../..;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
StringPooling="TRUE"
MinimalRebuild="FALSE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="0"
@@ -98,11 +97,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib touche_release/touche.lib parallaction_release/parallaction.lib cruise_release/cruise.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 drascula_release/drascula.lib parallaction_release/parallaction.lib"
OutputFile="$(OutDir)/scummvm.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- IgnoreDefaultLibraryNames="libcmt.lib"
+ IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="FALSE"
SubSystem="1"
OptimizeReferences="2"
@@ -124,8 +123,6 @@
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
@@ -135,8 +132,7 @@
</References>
<Files>
<Filter
- Name="base"
- Filter="">
+ Name="base">
<File
RelativePath="..\..\base\commandLine.cpp">
</File>
@@ -172,8 +168,7 @@
</File>
</Filter>
<Filter
- Name="common"
- Filter="">
+ Name="common">
<File
RelativePath="..\..\common\advancedDetector.cpp">
</File>
@@ -250,6 +245,12 @@
RelativePath="..\..\common\md5.h">
</File>
<File
+ RelativePath="..\..\common\memorypool.cpp">
+ </File>
+ <File
+ RelativePath="..\..\common\memorypool.h">
+ </File>
+ <File
RelativePath="..\..\common\mutex.cpp">
</File>
<File
@@ -265,6 +266,9 @@
RelativePath="..\..\common\pack-start.h">
</File>
<File
+ RelativePath="..\..\common\ptr.h">
+ </File>
+ <File
RelativePath="..\..\common\rect.h">
</File>
<File
@@ -320,8 +324,7 @@
</File>
</Filter>
<Filter
- Name="sound"
- Filter="">
+ Name="sound">
<File
RelativePath="..\..\sound\adpcm.cpp">
</File>
@@ -360,6 +363,20 @@
</File>
<File
RelativePath="..\..\sound\iff.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\sound\iff.h">
@@ -428,10 +445,23 @@
RelativePath="..\..\sound\wave.h">
</File>
<Filter
- Name="softsynth"
- Filter="">
+ Name="softhsynth">
<File
RelativePath="..\..\sound\softsynth\adlib.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\sound\softsynth\emumidi.h">
@@ -441,6 +471,20 @@
</File>
<File
RelativePath="..\..\sound\softsynth\mt32.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\sound\softsynth\pcspk.cpp">
@@ -450,13 +494,26 @@
</File>
<File
RelativePath="..\..\sound\softsynth\ym2612.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"/>
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\sound\softsynth\ym2612.h">
</File>
<Filter
- Name="mt32"
- Filter="">
+ Name="mt32">
<File
RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp">
</File>
@@ -514,8 +571,7 @@
</Filter>
</Filter>
<Filter
- Name="mods"
- Filter="">
+ Name="mods">
<File
RelativePath="..\..\sound\mods\infogrames.cpp">
</File>
@@ -555,8 +611,7 @@
</Filter>
</Filter>
<Filter
- Name="txt"
- Filter="">
+ Name="txt">
<File
RelativePath="..\..\COPYING">
</File>
@@ -581,42 +636,13 @@
</File>
</Filter>
<Filter
- Name="backends"
- Filter="">
+ Name="backends">
<File
RelativePath="..\..\backends\intern.h">
</File>
<Filter
- Name="fs"
- Filter="">
+ Name="sdl">
<File
- RelativePath="..\..\backends\fs\fs-factory.cpp">
- </File>
- <File
- RelativePath="..\..\backends\fs\fs-factory.h">
- </File>
- </Filter>
- <Filter
- Name="midi"
- Filter="">
- <File
- RelativePath="..\..\backends\midi\windows.cpp">
- </File>
- </Filter>
- <Filter
- Name="timer"
- Filter="">
- <File
- RelativePath="..\..\backends\timer\default\default-timer.cpp">
- </File>
- <File
- RelativePath="..\..\backends\timer\default\default-timer.h">
- </File>
- </Filter>
- <Filter
- Name="sdl"
- Filter="">
- <File
RelativePath="..\..\backends\platform\sdl\events.cpp">
</File>
<File
@@ -628,13 +654,15 @@
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"/>
</FileConfiguration>
</File>
<File
@@ -645,9 +673,41 @@
</File>
</Filter>
<Filter
- Name="saves"
- Filter="">
+ Name="fs">
<File
+ RelativePath="..\..\backends\fs\abstract-fs.h">
+ </File>
+ <File
+ RelativePath="..\..\backends\fs\fs-factory.h">
+ </File>
+ <Filter
+ Name="windows">
+ <File
+ RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp">
+ </File>
+ <File
+ RelativePath="..\..\backends\fs\windows\windows-fs-factory.h">
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="midi">
+ <File
+ RelativePath="..\..\backends\midi\windows.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="timer">
+ <File
+ RelativePath="..\..\backends\timer\default\default-timer.cpp">
+ </File>
+ <File
+ RelativePath="..\..\backends\timer\default\default-timer.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="saves">
+ <File
RelativePath="..\..\backends\saves\compressed\compressed-saves.cpp">
</File>
<File
@@ -664,19 +724,20 @@
</File>
</Filter>
<Filter
- Name="events"
- Filter="">
- <File
- RelativePath="..\..\backends\events\default\default-events.cpp">
- </File>
- <File
- RelativePath="..\..\backends\events\default\default-events.h">
- </File>
+ Name="events">
+ <Filter
+ Name="default">
+ <File
+ RelativePath="..\..\backends\events\default\default-events.cpp">
+ </File>
+ <File
+ RelativePath="..\..\backends\events\default\default-events.h">
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
- Name="gui"
- Filter="">
+ Name="gui">
<File
RelativePath="..\..\gui\about.cpp">
</File>
@@ -684,12 +745,6 @@
RelativePath="..\..\gui\about.h">
</File>
<File
- RelativePath="..\..\gui\Actions.cpp">
- </File>
- <File
- RelativePath="..\..\gui\Actions.h">
- </File>
- <File
RelativePath="..\..\gui\browser.cpp">
</File>
<File
@@ -825,15 +880,9 @@
RelativePath="..\..\gui\ThemeClassic.cpp">
</File>
<File
- RelativePath="..\..\gui\ThemeClassic.h">
- </File>
- <File
RelativePath="..\..\gui\ThemeModern.cpp">
</File>
<File
- RelativePath="..\..\gui\ThemeModern.h">
- </File>
- <File
RelativePath="..\..\gui\widget.cpp">
</File>
<File
@@ -841,8 +890,7 @@
</File>
</Filter>
<Filter
- Name="graphics"
- Filter="">
+ Name="graphics">
<File
RelativePath="..\..\graphics\colormasks.h">
</File>
@@ -872,18 +920,6 @@
</File>
<File
RelativePath="..\..\graphics\iff.cpp">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"/>
- </FileConfiguration>
</File>
<File
RelativePath="..\..\graphics\iff.h">
@@ -925,8 +961,7 @@
RelativePath="..\..\graphics\surface.h">
</File>
<Filter
- Name="scaler"
- Filter="">
+ Name="scaler">
<File
RelativePath="..\..\graphics\scaler\2xsai.cpp">
</File>
@@ -945,16 +980,14 @@
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
-"
+ CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
"
Outputs="$(OutDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
-"
+ CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
"
Outputs="$(OutDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -970,16 +1003,14 @@
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
-"
+ CommandLine="nasm.exe -f win32 -g -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
"
Outputs="$(OutDir)\$(InputName).obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
- CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
-"
+ CommandLine="nasm.exe -f win32 -o "$(OutDir)\$(InputName).obj" "$(InputPath)"
"
Outputs="$(OutDir)\$(InputName).obj"/>
</FileConfiguration>
</File>
@@ -1009,8 +1040,7 @@
</File>
</Filter>
<Filter
- Name="fonts"
- Filter="">
+ Name="fonts">
<File
RelativePath="..\..\graphics\fonts\consolefont.cpp">
</File>
@@ -1026,14 +1056,16 @@
</Filter>
</Filter>
<Filter
- Name="engines"
- Filter="">
+ Name="engines">
<File
RelativePath="..\..\engines\engine.cpp">
</File>
<File
RelativePath="..\..\engines\engine.h">
</File>
+ <File
+ RelativePath="..\..\engines\metaengine.h">
+ </File>
</Filter>
</Files>
<Globals>
Modified: scummvm/trunk/dists/msvc71/sky.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/sky.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/sky.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -111,8 +111,7 @@
</References>
<Files>
<Filter
- Name="music"
- Filter="">
+ Name="music">
<File
RelativePath="..\..\engines\sky\music\adlibchannel.cpp">
</File>
Modified: scummvm/trunk/dists/msvc71/sword1.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/sword1.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/sword1.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/sword2.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/sword2.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/sword2.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -77,6 +77,7 @@
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc71/touche.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/touche.vcproj 2008-04-01 09:19:22 UTC (rev 31348)
+++ scummvm/trunk/dists/msvc71/touche.vcproj 2008-04-01 09:21:05 UTC (rev 31349)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="touche"
- ProjectGUID="{43C2D921-FEE3-40BE-B58A-A6CA34235731}"
+ ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -21,7 +21,7 @@
AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
Optimization="0"
AdditionalIncludeDirectories="../..;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
@@ -70,13 +70,14 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="../..;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
+ AdditionalIncludeDirectories="../../;../../engines"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
StringPooling="TRUE"
ExceptionHandling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
+ DisableLanguageExtensions="FALSE"
ForceConformanceInForLoopScope="TRUE"
UsePrecompiledHeader="0"
WarningLevel="4"
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