- Updated MSVC8 project files

- Renamed base/options.cpp to base/commandLine.cpp because of conflict
  with gui/options.cpp which sit in same directory in MSVC builds
- Moved AudioCDManager singleton declaration outside of Audio namespace
- Fixed numerous MSVC warning of potentially uninitialized variables and
  int <-> bool conversions.

svn-id: r22397

8 files changed, 129 insertions, 17 deletions

diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index f2c29bcbf3..b2b61cab8d 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -191,6 +191,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\draw_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\draw_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\driver_vga.cpp"
 			>
 		</File>
@@ -207,6 +215,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\game_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\game_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\global.cpp"
 			>
 		</File>
@@ -239,6 +255,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\init_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp"
 			>
 		</File>
@@ -358,6 +382,14 @@
 			RelativePath="..\..\engines\gob\video.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\gob\video_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\video_v2.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index b0de755d4a..c182546aa7 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -191,6 +191,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\plugin.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\resource.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 0cee3729a5..5120208a32 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -311,6 +311,14 @@
 			Name="he"
 			>
 			<File
+				RelativePath="..\..\engines\scumm\he\animation_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\animation_he.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
 				>
 			</File>
@@ -418,6 +426,18 @@
 				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"
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index a7370c198d..6668b5fbf5 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -70,10 +70,10 @@
 				AdditionalDependencies="winmm.lib sdl.lib zdll.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 kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib"
+				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
+				SubSystem="2"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -161,7 +161,7 @@
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="false"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -199,6 +199,14 @@
 			Name="base"
 			>
 			<File
+				RelativePath="..\..\base\commandLine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\base\commandLine.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\engine.cpp"
 				>
 			</File>
@@ -207,11 +215,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\base\options.cpp"
+				RelativePath="..\..\base\game.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\base\options.h"
+				RelativePath="..\..\base\internal_version.h"
 				>
 			</File>
 			<File
@@ -219,6 +227,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\base\main.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\plugins.cpp"
 				>
 			</File>
@@ -227,6 +239,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\base\version.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\version.h"
 				>
 			</File>
@@ -275,11 +291,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\list.h"
+				RelativePath="..\..\common\hashmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\map.h"
+				RelativePath="..\..\common\list.h"
 				>
 			</File>
 			<File
@@ -814,6 +834,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\eval.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gui\eval.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\Key.cpp"
 				>
 			</File>
@@ -890,6 +918,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\theme-config.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\theme.cpp"
 				>
 			</File>
@@ -898,6 +930,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\ThemeClassic.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\ThemeNew.cpp"
 				>
 			</File>
diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj
index f5b8b162f7..3c49c31a03 100644
--- a/dists/msvc8/simon.vcproj
+++ b/dists/msvc8/simon.vcproj
@@ -160,6 +160,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\simon\animation.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\animation.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\charset.cpp"
 			>
 		</File>
@@ -184,6 +192,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\simon\draw.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\event.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\game.cpp"
 			>
 		</File>
@@ -240,6 +256,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\simon\string.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\subroutine.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\verb.cpp"
 			>
 		</File>
@@ -251,6 +275,10 @@
 			RelativePath="..\..\engines\simon\vga.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\simon\window.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index f91633e45b..38def46c26 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -187,10 +187,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\d_draw.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\debug.cpp"
 			>
 		</File>
@@ -283,10 +279,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\rdwin.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\render.cpp"
 			>
 		</File>
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index a18e4bd76f..e01a69fdd9 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -1,6 +1,6 @@
 #include "winresrc.h"
 
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 0,9,0,0
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 6cc4818be0..8876989c49 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -1,6 +1,6 @@
 #include "winresrc.h"
 
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0