? wine.diff
? Bin/cxbe
Index: Makefile
===================================================================
RCS file: /cvsroot/cxbx/Cxbx/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1 Apr 2003 23:10:51 -0000	1.3
+++ Makefile	12 Nov 2004 03:11:45 -0000
@@ -33,8 +33,8 @@
 # ******************************************************************
 # *  File Authors: Aaron Robinson, Edgar Hucek
 # ******************************************************************
-CC	= g++
-CFLAGS  = -g -O2 -IInclude -IInclude/Core -IInclude/Standard -IInclude/Standard/Cxbe -IInclude/Linux/
+CC	= wineg++
+CFLAGS  = -g -O2 -IInclude -IInclude/Core -IInclude/Standard -IInclude/Standard/Cxbe -IInclude/Linux/ -IInclude/Win32/CxbxKrnl
 OBJCOPY	= objcopy
 GCC295 = cpp0-2.95
 #LDFLAGS = -s -S -T ldscript.ld
Index: Include/Cxbx.h
===================================================================
RCS file: /cvsroot/cxbx/Cxbx/Include/Cxbx.h,v
retrieving revision 1.158
diff -u -r1.158 Cxbx.h
--- Include/Cxbx.h	12 Sep 2004 18:31:23 -0000	1.158
+++ Include/Cxbx.h	12 Nov 2004 03:11:45 -0000
@@ -35,7 +35,9 @@
 #define CXBX_H
 
 // CxbxKrnl exports, others import
-#ifndef _CXBXKRNL_INTERNAL
+#ifdef __WINE__
+#define CXBXKRNL_API
+#elif !defined(_CXBXKRNL_INTERNAL)
 #define CXBXKRNL_API __declspec(dllimport)
 #else
 #define CXBXKRNL_API __declspec(dllexport)
Index: Include/Win32/CxbxKrnl/Emu.h
===================================================================
RCS file: /cvsroot/cxbx/Cxbx/Include/Win32/CxbxKrnl/Emu.h,v
retrieving revision 1.40
diff -u -r1.40 Emu.h
--- Include/Win32/CxbxKrnl/Emu.h	16 Sep 2004 06:22:28 -0000	1.40
+++ Include/Win32/CxbxKrnl/Emu.h	12 Nov 2004 03:11:45 -0000
@@ -38,7 +38,9 @@
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
+#ifndef __WINE__
 #include <multimon.h>
+#endif
 
 // pointless function
 extern "C" CXBXKRNL_API void NTAPI EmuNoFunc();