Some fixes for compilation under MinGW and Visual C++ .Net.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@604 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/Debugger.txt

@@ -478,5 +478,5 @@ When you use these buttons, the prompt doesn't change. This means the
 status lines with the registers and disassembly will be "stale". You
 can update them just by pressing Enter in the prompt.
 
-You can also use the Step and Trace buttons from anywhere in the GUI via
+You can also use the Step, Trace and Frame+1 buttons from anywhere in
-the keyboard, with Alt-S and Alt-T. (TODO: Alt-F for Frame+1)
+the GUI via the keyboard, with Alt-S, Alt-T and Alt-F.

stella/configure

@@ -654,7 +654,7 @@ INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
 LIBS="$LIBS `$_sdlconfig --libs` -lz"
 
 case $_host_os in
-		unix*)
+		unix)
 			DEFINES="$DEFINES -DBSPF_UNIX -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
 			MODULES="$MODULES $SRC/unix"
 			INCLUDES="$INCLUDES -I$SRC/unix"
@@ -665,20 +665,20 @@ case $_host_os in
 				LIBS="$LIBS -L/usr/X11R6/lib -lGL"
 			fi
 			;;
-		mingw*)
+		win32)
 			DEFINES="$DEFINES -DBSPF_WIN32 -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
 			MODULES="$MODULES $SRC/win32"
 			INCLUDES="$INCLUDES -I$SRC/win32"
 
 			# Add OpenGL stuff
 			if test "$_build_gl" = yes ; then
-				DEFINES="$DEFINES -DDISPLAY_OPENGL"
+				DEFINES="$DEFINES -DDISPLAY_OPENGL -DTEXTURES_ARE_LOST"
 				LIBS="$LIBS -lopengl32"
 			fi
 			;;
 		*)
 			echo "WARNING: host system not currenty supported"
-			stop
+			exit
 			;;
 esac
 

stella/src/emucore/TIASound.c

@@ -34,7 +34,14 @@
 
 #ifdef SOUND_SUPPORT
 
-#include "bspf.hxx"
+// For some braindead reason, Visual C++ won't let bspf.hxx be included
+// here, so I have to redefine the following types (I hate Windows ...)
+typedef signed char Int8;
+typedef unsigned char uInt8;
+typedef signed short Int16;
+typedef unsigned short uInt16;
+typedef signed int Int32;
+typedef unsigned int uInt32;
 
 #ifdef __cplusplus
 extern "C" {

stella/src/win32/Stella/Stella.vcproj

@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\debugger;..\..\gui;..\..\emucore\m6502\src\bspf\src;..\..\emucore\m6502\src;..\..\emucore;..\..\common;..\..\win32"
+				AdditionalIncludeDirectories="..\..\yacc;..\..\debugger;..\..\gui;..\..\emucore\m6502\src\bspf\src;..\..\emucore\m6502\src;..\..\emucore;..\..\common;..\..\win32"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SOUND_SUPPORT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -73,7 +73,7 @@ opengl32.lib"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\emucore\m6502\src\bspf\src;..\..\emucore\m6502\src;..\..\emucore;..\..\common;..\..\gui;..\..\debugger;..\..\win32"
+				AdditionalIncludeDirectories="..\..\yacc;..\..\emucore\m6502\src\bspf\src;..\..\emucore\m6502\src;..\..\emucore;..\..\common;..\..\gui;..\..\debugger;..\..\win32"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SOUND_SUPPORT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -314,9 +314,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\m6502\src\M6502Hi.cxx">
 			</File>
-			<File
-				RelativePath="..\..\emucore\m6502\src\M6502Low.cxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\M6532.cxx">
 			</File>
@@ -410,6 +407,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\TIASound.c">
 			</File>
+			<File
+				RelativePath="..\..\gui\ToggleBitWidget.cxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\unzip.c">
 			</File>
@@ -419,6 +419,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\gui\Widget.cxx">
 			</File>
+			<File
+				RelativePath="..\..\yacc\YaccParser.cxx">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -634,9 +637,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\m6502\src\M6502Hi.hxx">
 			</File>
-			<File
-				RelativePath="..\..\emucore\m6502\src\M6502Low.hxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\M6532.hxx">
 			</File>
@@ -742,6 +742,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\emucore\TIASound.h">
 			</File>
+			<File
+				RelativePath="..\..\gui\ToggleBitWidget.hxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\unzip.h">
 			</File>
@@ -754,6 +757,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\gui\Widget.hxx">
 			</File>
+			<File
+				RelativePath="..\..\yacc\YaccParser.hxx">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

stella/src/win32/module.mk

@@ -0,0 +1,12 @@
+MODULE := src/win32
+
+MODULE_OBJS := \
+	src/win32/FSNodeWin32.o \
+	src/win32/OSystemWin32.o \
+	src/win32/SettingsWin32.o
+
+MODULE_DIRS += \
+	src/win32
+
+# Include common rules 
+include $(srcdir)/common.rules

stella/src/yacc/YaccParser.cxx

@@ -1,7 +1,30 @@
-
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: YaccParser.cxx,v 1.2 2005-07-03 14:18:54 stephena Exp $
+//
+//   Based on code from ScummVM - Scumm Interpreter
+//   Copyright (C) 2002-2004 The ScummVM project
+//============================================================================
 
 //#include "YaccParser.hxx"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 namespace YaccParser {
 #include <stdio.h>
 #include <ctype.h>
@@ -160,3 +183,7 @@ int main(int argc, char **argv) {
 }
 #endif
 }
+
+#ifdef __cplusplus
+}
+#endif

stella/src/yacc/YaccParser.hxx

@@ -1,10 +1,38 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: YaccParser.hxx,v 1.2 2005-07-03 14:18:54 stephena Exp $
+//
+//   Based on code from ScummVM - Scumm Interpreter
+//   Copyright (C) 2002-2004 The ScummVM project
+//============================================================================
 
 #ifndef PARSER_HXX
 #define PARSER_HXX
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 namespace YaccParser {
 	int parse(const char *);
 	int getResult();
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif