--- np2/macosx/sysmng.cpp	2003/11/03 10:19:43	1.6
+++ np2/macosx/sysmng.cpp	2003/12/08 00:55:33	1.10
@@ -1,8 +1,8 @@
 #include	"compiler.h"
 #include	"np2.h"
 #include	"dosio.h"
-#include	"i286.h"
 #include	"sysmng.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"fddfile.h"
 #include	"diskdrv.h"
@@ -24,7 +24,7 @@ static struct {
 void sysmng_workclockreset(void) {
 
 	workclock.tick = GETTICK();
-	workclock.clock = I286_CLOCK;
+	workclock.clock = CPU_CLOCK;
 	workclock.draws = drawcount;
 }
 
@@ -39,8 +39,8 @@ BOOL sysmng_workclockrenewal(void) {
 	workclock.tick += tick;
 	workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;
 	workclock.draws = drawcount;
-	workclock.khz = (I286_CLOCK - workclock.clock) / tick;
-	workclock.clock = I286_CLOCK;
+	workclock.khz = (CPU_CLOCK - workclock.clock) / tick;
+	workclock.clock = CPU_CLOCK;
 	return(TRUE);
 }
 
@@ -95,12 +95,16 @@ void sysmng_updatecaption(BYTE flag) {
 			milstr_ncat(strclock, work, sizeof(strclock));
 		}
 	}
+#if defined(NP2GCC)
+	milstr_ncpy(work, np2oscfg.titles, sizeof(work));
+#else
 	milstr_ncpy(work, "Neko Project II", sizeof(work));
+#endif
 	milstr_ncat(work, strtitle, sizeof(work));
 	milstr_ncat(work, strclock, sizeof(work));
 
 #if defined(NP2GCC)
-    SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, work, kCFStringEncodingUTF8));
+    SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, work, CFStringGetSystemEncoding()));
 #else
 	mkstr255(str, work);
 	SetWTitle(hWndMain, str);