update and added mad lib by default

svn-id: r11264

6 files changed, 16 insertions, 20 deletions

diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj
index 2fbe17bf3f..ab0dbff4e1 100644
--- a/dists/msvc7/queen.vcproj
+++ b/dists/msvc7/queen.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;USE_MAD"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;USE_MAD"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index 747967abb9..82a397e2ff 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;USE_MAD;BYPASS_COPY_PROT"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;USE_MAD;BYPASS_COPY_PROT"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index d6ccdc659b..e291df6084 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ADLIB;USE_MAD"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,9 +38,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.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 libmad.lib sword2_debug/sword2.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"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
 				SubSystem="1"
@@ -73,7 +74,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ADLIB;USE_MAD"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
 				ExceptionHandling="TRUE"
@@ -90,10 +91,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.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 libmad.lib sword2_release/sword2.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"
+				IgnoreDefaultLibraryNames="libcmt.lib"
 				GenerateDebugInformation="FALSE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj
index f9b8222e86..92b9ed9afe 100644
--- a/dists/msvc7/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;USE_MAD"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;USE_MAD"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
index 8225bc9d85..eb4ccf0f27 100644
--- a/dists/msvc7/sky.vcproj
+++ b/dists/msvc7/sky.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;USE_MAD"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;USE_MAD"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index 8e006ad63e..24e25ced7d 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;USE_MAD"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../../;../../common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;USE_MAD"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
@@ -102,9 +102,6 @@
 				RelativePath="..\..\sword2\driver\_mouse.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\_mouse.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\d_draw.cpp">
 			</File>
 			<File
@@ -123,9 +120,6 @@
 				RelativePath="..\..\sword2\driver\keyboard.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\keyboard.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\language.cpp">
 			</File>
 			<File