aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-04-09 18:30:44 +0000
committerPaweł Kołodziejski2004-04-09 18:30:44 +0000
commit125e9b76593b8206a57b218c857ca19a4728d156 (patch)
tree6603e59750174bbfa1ac741c50a01bb8a63d3a33
parente795a7ce65d3eac01f7b07c28543f5186cfa3f13 (diff)
downloadscummvm-rg350-125e9b76593b8206a57b218c857ca19a4728d156.tar.gz
scummvm-rg350-125e9b76593b8206a57b218c857ca19a4728d156.tar.bz2
scummvm-rg350-125e9b76593b8206a57b218c857ca19a4728d156.zip
update
svn-id: r13524
-rw-r--r--dists/msvc7/kyra.vcproj109
-rw-r--r--dists/msvc7/scummvm.sln21
-rw-r--r--dists/msvc7/scummvm.vcproj7
3 files changed, 128 insertions, 9 deletions
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
new file mode 100644
index 0000000000..fedfc5d8f3
--- /dev/null
+++ b/dists/msvc7/kyra.vcproj
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="kyra"
+ ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="kyra_Debug"
+ IntermediateDirectory="kyra_Debug"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../;../../common"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+ MinimalRebuild="TRUE"
+ ExceptionHandling="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="TRUE"
+ EnableFunctionLevelLinking="TRUE"
+ ForceConformanceInForLoopScope="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ WarnAsError="TRUE"
+ SuppressStartupBanner="FALSE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/kyra.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="kyra_Release"
+ IntermediateDirectory="kyra_Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="../../;../../common"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+ StringPooling="TRUE"
+ ExceptionHandling="TRUE"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="FALSE"
+ EnableFunctionLevelLinking="FALSE"
+ ForceConformanceInForLoopScope="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ WarnAsError="TRUE"
+ DebugInformationFormat="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/kyra.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <File
+ RelativePath="..\..\kyra\kyra.cpp">
+ </File>
+ <File
+ RelativePath="..\..\kyra\kyra.h">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
index 8aed73449c..c4acb10454 100644
--- a/dists/msvc7/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
@@ -15,19 +15,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "
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
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
- {8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {C8AAE83E-198B-4ECA-A877-166827953979}
+ {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}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32
@@ -62,6 +65,10 @@ Global
{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
+ {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 740ecd3fa4..ec8395483b 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -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 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 saga_debug/saga.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"
@@ -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 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 saga_release/saga.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"
@@ -149,6 +149,9 @@
Name="common"
Filter="">
<File
+ RelativePath="..\..\common\array.h">
+ </File>
+ <File
RelativePath="..\..\common\config-manager.cpp">
</File>
<File