- Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.

- Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
- Simplified the MSVC9 <-> MSVC8 conversion tools a bit

svn-id: r42288

1 files changed, 52 insertions, 352 deletions

diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index b90f38be9f..d0cbe3d639 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -8,361 +8,61 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="sword2_Debug"
-			IntermediateDirectory="sword2_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="sword2_Release"
-			IntermediateDirectory="sword2_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sword2.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\sword2\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\anims.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\controls.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\events.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\header.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\interpreter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\layers.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\maketext.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\memory.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\protocol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\render.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\resman.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\router.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\scroll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\speech.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\startup.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sword2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\sync.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\walker.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\sword2\animation.cpp" />
+		<File RelativePath="..\..\engines\sword2\animation.h" />
+		<File RelativePath="..\..\engines\sword2\anims.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.cpp" />
+		<File RelativePath="..\..\engines\sword2\console.h" />
+		<File RelativePath="..\..\engines\sword2\controls.cpp" />
+		<File RelativePath="..\..\engines\sword2\controls.h" />
+		<File RelativePath="..\..\engines\sword2\debug.cpp" />
+		<File RelativePath="..\..\engines\sword2\debug.h" />
+		<File RelativePath="..\..\engines\sword2\defs.h" />
+		<File RelativePath="..\..\engines\sword2\events.cpp" />
+		<File RelativePath="..\..\engines\sword2\function.cpp" />
+		<File RelativePath="..\..\engines\sword2\header.h" />
+		<File RelativePath="..\..\engines\sword2\icons.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.cpp" />
+		<File RelativePath="..\..\engines\sword2\interpreter.h" />
+		<File RelativePath="..\..\engines\sword2\layers.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.cpp" />
+		<File RelativePath="..\..\engines\sword2\logic.h" />
+		<File RelativePath="..\..\engines\sword2\maketext.cpp" />
+		<File RelativePath="..\..\engines\sword2\maketext.h" />
+		<File RelativePath="..\..\engines\sword2\memory.cpp" />
+		<File RelativePath="..\..\engines\sword2\memory.h" />
+		<File RelativePath="..\..\engines\sword2\menu.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.cpp" />
+		<File RelativePath="..\..\engines\sword2\mouse.h" />
+		<File RelativePath="..\..\engines\sword2\music.cpp" />
+		<File RelativePath="..\..\engines\sword2\object.h" />
+		<File RelativePath="..\..\engines\sword2\palette.cpp" />
+		<File RelativePath="..\..\engines\sword2\protocol.cpp" />
+		<File RelativePath="..\..\engines\sword2\render.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.cpp" />
+		<File RelativePath="..\..\engines\sword2\resman.h" />
+		<File RelativePath="..\..\engines\sword2\router.cpp" />
+		<File RelativePath="..\..\engines\sword2\router.h" />
+		<File RelativePath="..\..\engines\sword2\saveload.cpp" />
+		<File RelativePath="..\..\engines\sword2\saveload.h" />
+		<File RelativePath="..\..\engines\sword2\screen.cpp" />
+		<File RelativePath="..\..\engines\sword2\screen.h" />
+		<File RelativePath="..\..\engines\sword2\scroll.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.cpp" />
+		<File RelativePath="..\..\engines\sword2\sound.h" />
+		<File RelativePath="..\..\engines\sword2\speech.cpp" />
+		<File RelativePath="..\..\engines\sword2\sprite.cpp" />
+		<File RelativePath="..\..\engines\sword2\startup.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.cpp" />
+		<File RelativePath="..\..\engines\sword2\sword2.h" />
+		<File RelativePath="..\..\engines\sword2\sync.cpp" />
+		<File RelativePath="..\..\engines\sword2\walker.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>