- 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

4 files changed, 3 insertions, 3 deletions

diff --git a/base/options.cpp b/base/commandLine.cpp
index e01621af0a..2dec1703f5 100644
--- a/base/options.cpp
+++ b/base/commandLine.cpp
@@ -24,7 +24,7 @@
 #include "common/stdafx.h"
 
 #include "base/engine.h"
-#include "base/options.h"
+#include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"
 
diff --git a/base/options.h b/base/commandLine.h
index dbf1776c74..dbf1776c74 100644
--- a/base/options.h
+++ b/base/commandLine.h
diff --git a/base/main.cpp b/base/main.cpp
index c5f646c7a4..292b57afdd 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -32,7 +32,7 @@
 #include "common/stdafx.h"
 #include "backends/fs/fs.h"
 #include "base/engine.h"
-#include "base/options.h"
+#include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"
 #include "common/config-manager.h"
diff --git a/base/module.mk b/base/module.mk
index 5af0e1349c..3a515b4f5c 100644
--- a/base/module.mk
+++ b/base/module.mk
@@ -3,7 +3,7 @@ MODULE := base
 MODULE_OBJS := \
 	engine.o \
 	main.o \
-	options.o \
+	commandLine.o \
 	plugins.o \
 	version.o