[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _console.cpp,1.2,1.3 _mouse.cpp,1.1,1.2 d_draw.cpp,1.2,1.3 d_sound.cpp,1.1,1.2 driver96.h,1.2,1.3 keyboard.cpp,1.2,1.3 language.cpp,1.1,1.2 menu.cpp,1.1,1.2 misc.cpp,1.1,1.2 palette.cpp,1.1,1.2 render.cpp,1.1,1.2 sprite.cpp,1.1,1.2

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv13284/bs2/driver

Modified Files:
	_console.cpp _mouse.cpp d_draw.cpp d_sound.cpp driver96.h 
	keyboard.cpp language.cpp menu.cpp misc.cpp palette.cpp 
	render.cpp sprite.cpp 
Log Message:

Compiles on mingw now


Index: _console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- _console.cpp	28 Jul 2003 02:37:47 -0000	1.2
+++ _console.cpp	28 Jul 2003 03:12:49 -0000	1.3
@@ -57,6 +57,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 
 #include "d_draw.h"

Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- _mouse.cpp	28 Jul 2003 01:47:40 -0000	1.1
+++ _mouse.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -131,6 +131,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 
 #include "d_draw.h"

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- d_draw.cpp	28 Jul 2003 02:37:47 -0000	1.2
+++ d_draw.cpp	28 Jul 2003 03:12:49 -0000	1.3
@@ -26,6 +26,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "rdwin.h"
 #include "_mouse.h"

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- d_sound.cpp	28 Jul 2003 01:47:40 -0000	1.1
+++ d_sound.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -355,6 +355,7 @@
 //#include <windowsx.h>
 #include <stdio.h>
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "rdwin.h"			// for hwnd.
 

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- driver96.h	28 Jul 2003 02:10:24 -0000	1.2
+++ driver96.h	28 Jul 2003 03:12:49 -0000	1.3
@@ -1070,7 +1070,7 @@
 //
 
 // defines specific to windows headers...
-#ifndef _MSC_VER
+#ifndef WIN32
 
 #define SEM_FAILCRITICALERRORS 1
 #define FILE_ATTRIBUTE_NORMAL 0x80
@@ -1254,9 +1254,11 @@
 typedef int BOOL;
 #define TRUE 1
 #define FALSE 0
-typedef uint32 DWORD;
 
+#ifndef WIN32
+typedef uint32 DWORD;
 typedef long int LARGE_INTEGER;
+#endif
 
 //
 //	Structure definitions
@@ -1431,6 +1433,7 @@
 } _drvKeyStatus;
 
 
+#ifndef WIN32
 // should probably remove this struct as it just replaces a windows struct...
 typedef struct {
     DWORD dwLength;
@@ -1442,6 +1445,7 @@
     DWORD dwTotalVirtual;
     DWORD dwAvailVirtual;
 } GCC_PACK MEMORYSTATUS;
+#endif
 
 //
 //	Function Prototypes
@@ -1606,6 +1610,7 @@
 extern int32 SetFxIdVolume(int32 id, uint8 vol);
 
 
+#ifndef WIN32
 //-----------------------------------------------------------------------------
 //	Misc functions - from misc.cpp
 //-----------------------------------------------------------------------------
@@ -1618,6 +1623,7 @@
 extern int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a);
 extern void _mkdir(const char *pathname);
 extern void GetModuleFileName(void *module, char *destStr, uint32 maxLen);
+#endif
 
 //-----------------------------------------------------------------------------
 //Macro for calling error handler with source filename and line.

Index: keyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/keyboard.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- keyboard.cpp	28 Jul 2003 02:37:47 -0000	1.2
+++ keyboard.cpp	28 Jul 2003 03:12:49 -0000	1.3
@@ -65,6 +65,7 @@
 //#include <windows.h>
 //#include <windowsx.h>
 
+#include "stdafx.h"
 #include "driver96.h"
 
 uint8	keyBacklog = 0;				// The number of key presses waiting to be processed.

Index: language.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/language.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- language.cpp	28 Jul 2003 01:47:40 -0000	1.1
+++ language.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -63,6 +63,7 @@
 //=============================================================================
 
 
+#include "stdafx.h"
 #include "driver96.h"
 
 

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menu.cpp	28 Jul 2003 01:47:40 -0000	1.1
+++ menu.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -114,6 +114,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "menu.h"
 #include "d_draw.h"

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- misc.cpp	28 Jul 2003 01:47:41 -0000	1.1
+++ misc.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -17,12 +17,15 @@
  * $Header$
  */
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "../sword2.h"
 
+#ifndef WIN32
 uint32 timeGetTime(void) {
 	return g_bs2->_syst->get_msecs();
 }
+#endif
 
 void VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
 	warning("stub VirtualUnlock");
@@ -51,10 +54,12 @@
 	return 1;
 }
 
+#ifndef WIN32
 // FIXME wrap different platform specific mkdir calls and actually do something
 void _mkdir(const char *pathname) {
 	warning("stub _mkdir %s", pathname);
 }
+#endif
 
 void GetModuleFileName(void *module, char *destStr, uint32 maxLen) {
 	warning("stub GetModuleFileName");

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- palette.cpp	28 Jul 2003 01:47:41 -0000	1.1
+++ palette.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -153,6 +153,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "d_draw.h"
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- render.cpp	28 Jul 2003 01:47:41 -0000	1.1
+++ render.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -201,6 +201,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "d_draw.h"
 #include "rdwin.h"

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/sprite.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sprite.cpp	28 Jul 2003 01:47:41 -0000	1.1
+++ sprite.cpp	28 Jul 2003 03:12:49 -0000	1.2
@@ -267,6 +267,7 @@
 
 //#include "ddraw.h"
 
+#include "stdafx.h"
 #include "driver96.h"
 #include "d_draw.h"
 #include "render.h"