--- np2/x11/compiler.h	2003/12/11 15:11:56	1.7
+++ np2/x11/compiler.h	2004/01/15 15:52:32	1.9
@@ -79,13 +79,6 @@ typedef	unsigned char		TCHAR;
 
 typedef	int			BOOL;
 
-#include "common.h"
-#include "milstr.h"
-#include "_memory.h"
-#include "rect.h"
-#include "lstarray.h"
-#include "trace.h"
-
 #ifndef	TRUE
 #define	TRUE	1
 #endif
@@ -120,17 +113,22 @@ typedef	int			BOOL;
 #endif
 
 #define	UNUSED(v)	((void)(v))
-#define	INLINE		__inline
 #define	FASTCALL
 #define	SOUNDCALL
 #define	MEMCALL
 #define	CPUCALL
 
 #ifdef	DEBUG
+#define	INLINE
 #define	__ASSERT(s)	assert(s)
 #else
+#ifndef	__ASSERT
 #define	__ASSERT(s)
 #endif
+#ifndef	INLINE
+#define	INLINE		__inline
+#endif
+#endif
 
 #ifndef	NELEMENTS
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
@@ -145,15 +143,17 @@ UINT32 gettick();
 #undef	MEMOPTIMIZE
 #elif defined(arm) || defined (__arm__)
 #define	MEMOPTIMIZE	2
+#define	REG8		UINT
+#define	REG16		UINT
 #else
 #define	MEMOPTIMIZE	1
 #endif
 
 #define	SUPPORT_EUC
 
-#define	SUPPORT_8BPP
-#define	SUPPORT_24BPP
+#undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
+#define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
@@ -161,6 +161,13 @@ UINT32 gettick();
 #define	SUPPORT_KEYDISP
 #endif
 
+#if defined(USE_SDL)
+#define	USE_SYSMENU
+#define	SCREEN_BPP	16
+#undef	SUPPORT_24BPP
+#undef	SUPPORT_32BPP
+#endif
+
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.
@@ -168,4 +175,11 @@ UINT32 gettick();
 extern char timidity_cfgfile_path[MAX_PATH];
 #define	TIMIDITY_CFGFILE	timidity_cfgfile_path
 
+#include "common.h"
+#include "milstr.h"
+#include "_memory.h"
+#include "rect.h"
+#include "lstarray.h"
+#include "trace.h"
+
 #endif	/* NP2_X11_COMPILER_H__ */