--- np2/x11/main.c	2004/01/07 14:51:53	1.12
+++ np2/x11/main.c	2004/05/22 16:35:08	1.16
@@ -47,6 +47,7 @@
 #include "sysmenu.h"
 #include "toolwin.h"
 #include "viewer.h"
+#include "debugwin.h"
 
 #include "commng.h"
 #include "fontmng.h"
@@ -116,7 +117,7 @@ usage(void)
 
 	printf("Usage: %s [options] [[FD1 image] [[FD2 image] [[FD3 image] [FD4 image]]]]\n\n", progname);
 	printf("options:\n");
-	printf("\t--help\n          [-h]        : print this message\n");
+	printf("\t--help            [-h]        : print this message\n");
 	printf("\t--config          [-c] <file> : specify config file\n");
 	printf("\t--timidity-config [-C] <file> : specify timidity config file\n");
 	printf("\t--shared-pixmap   [-p]        : use MIT-SHM pixmap extention\n");
@@ -250,7 +251,7 @@ main(int argc, char *argv[])
 
 	rand_setseed((SINT32)time(NULL));
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	mmxflag = havemmx() ? 0 : MMXFLAG_NOTSUPPORT;
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
@@ -269,7 +270,7 @@ main(int argc, char *argv[])
 	scrnmng_initialize();
 	kbdmng_init();
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 	scrnmode = 0;
 	if (np2cfg.RASTER) {
@@ -357,6 +358,7 @@ main(int argc, char *argv[])
 	}
 
 	pccore_term();
+	debugwin_destroy();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();