--- np2/x11/compiler.h	2003/11/21 06:51:16	1.4
+++ np2/x11/compiler.h	2003/11/30 16:18:08	1.6
@@ -1,6 +1,12 @@
 #ifndef	NP2_X11_COMPILER_H__
 #define	NP2_X11_COMPILER_H__
 
+#ifdef	WORDS_BIGENDIAN
+#define	BYTESEX_BIG
+#else	/* !WORDS_BIGENDIAN */
+#define	BYTESEX_LITTLE
+#endif	/* WORDS_BIGENDIAN */
+
 #if defined(USE_NETBSDAUDIO) && !defined(__NetBSD__)
 #undef	USE_NETBSDAUDIO
 #endif
@@ -13,12 +19,6 @@
 #undef	NOSOUND
 #endif	/* !USE_NETBSDAUDIO && !USE_OSSAUDIO && !USE_ESDAUDIO && !USE_SDLAUDIO && !USE_SDMIXER */
 
-#ifdef	WORDS_BIGENDIAN
-#define	BYTESEX_BIG
-#else	/* !WORDS_BIGENDIAN */
-#define	BYTESEX_LITTLE
-#endif	/* WORDS_BIGENDIAN */
-
 #if defined(NOSOUND)
 
 #undef	VERMOUTH_LIB
@@ -132,7 +132,13 @@ UINT32 gettick();
 #define	GETRAND()	random()
 #define	SPRINTF		sprintf
 
+#if defined(i386) || defined(__i386__)
+#undef	MEMOPTIMIZE
+#elif defined(arm) || defined (__arm__)
+#define	MEMOPTIMIZE	2
+#else
 #define	MEMOPTIMIZE	1
+#endif
 
 #define	SUPPORT_EUC
 
@@ -142,6 +148,10 @@ UINT32 gettick();
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
+#if defined(USE_GTK)
+#define	SUPPORT_KEYDISP
+#endif
+
 /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.