Specify project name in np2ver.h only

Author: nmlgc

common/strres.c

@@ -1,5 +1,6 @@
 #include	"compiler.h"
 #include	"strres.h"
+#include	"np2ver.h"
 
 
 const UINT8 str_utf8[3] = {0xef, 0xbb, 0xbf};
@@ -43,7 +44,7 @@ const OEMCHAR str_posy[] = OEMTEXT("posy");
 const OEMCHAR str_width[] = OEMTEXT("width");
 const OEMCHAR str_height[] = OEMTEXT("height");
 
-const OEMCHAR str_np2[] = OEMTEXT("Neko Project II");
+const OEMCHAR str_np2[] = PROJECTNAME;
 const OEMCHAR str_resume[] = OEMTEXT("Resume");
 
 const OEMCHAR str_VM[] = OEMTEXT("VM");

np2ver.h

@@ -1,3 +1,13 @@
+#if !defined(SUPPORT_PC9821)
+#define PROJECTNAME			OEMTEXT("Neko Project II - Debug Edition")
+#else
+#define PROJECTNAME			OEMTEXT("Neko Project 21 - Debug Edition")
+#endif
+#if !defined(_WIN64)
+#define PROJECTSUBNAME		OEMTEXT("")
+#else
+#define PROJECTSUBNAME		OEMTEXT(" x64")
+#endif
 
 #define	NP2VER_CORE			"ver.0.83"
 

win9x/dialog/d_about.cpp

@@ -12,8 +12,8 @@
 
 static	SIZE	s_szAbout;
 
-static const OEMCHAR str_np2title[] = OEMTEXT(PROJECTNAME) \
-										OEMTEXT(PROJECTSUBNAME) \
+static const OEMCHAR str_np2title[] = PROJECTNAME \
+										PROJECTSUBNAME \
 										OEMTEXT("  ");
 static const OEMCHAR np2infostr[] = OEMTEXT("CPU: %CPU% %CLOCK%\nMEM: %MEM1%\nGDC: %GDC%\n     %GDC2%\nTEXT: %TEXT%\nGRPH: %GRPH%\nSOUND: %EXSND%\n\nBIOS: %BIOS%\nRHYTHM: %RHYTHM%\n\nSCREEN: %DISP%");
 

win9x/np2.cpp

@@ -58,6 +58,7 @@
 #if defined(SUPPORT_DCLOCK)
 #include "dclock.h"
 #endif
+#include "np2ver.h"
 #include "break.h"
 
 #ifdef BETA_RELEASE
@@ -75,7 +76,7 @@ static	TCHAR		szClassName[] = _T("NP2-MainWindow");
 		BOOL		winui_en;
 
 		NP2OSCFG	np2oscfg = {
-						OEMTEXT(PROJECTNAME) OEMTEXT(PROJECTSUBNAME),
+						PROJECTNAME PROJECTSUBNAME,
 						OEMTEXT("NP2"),
 						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 0, 0, 1, 0, 0,
 						0, 0, KEY_UNKNOWN, 0,

win9x/np2.h

@@ -2,18 +2,6 @@
 extern "C" {
 #endif
 
-#if !defined(SUPPORT_PC9821)
-#define PROJECTNAME			"Neko Project II"
-#else
-#define PROJECTNAME			"Neko Project 21"
-#endif
-
-#if !defined(_WIN64)
-#define PROJECTSUBNAME		""
-#else
-#define PROJECTSUBNAME		" x64"
-#endif
-
 typedef struct {
 	UINT8	port;
 	UINT8	def_en;

win9x/np21.rc

@@ -1075,8 +1075,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 STRINGTABLE
 {
-    IDS_APP_NAME2                 "Neko Project II"
-    IDS_APP_NAME21                "Neko Project 21"
     IDS_FILENAME_HELP             "np2.chm"
     IDS_CAPTION_TOOL              "NP2 tool"
     IDS_CAPTION_KEYDISP           "Key display"

win9x/resource.h

@@ -270,8 +270,6 @@
 #define IDC_ADDR_SEG                    18101
 #define IDC_ADDR_OFF                    18102
 #define IDC_ADDR_REAL                   18103
-#define IDS_APP_NAME2                   30001
-#define IDS_APP_NAME21                  30002
 #define IDS_FILENAME_HELP               30003
 #define IDS_FONTFACE                    30011
 #define IDS_PFONTFACE                   30012

win9x/sstp.cpp

@@ -15,6 +15,7 @@
 #if defined(OSLANG_UTF8) || defined(OSLANG_UCS2)
 #include "oemtext.h"
 #endif
+#include "np2ver.h"
 
 static	HWND		sstphwnd = NULL;
 static	int			sstp_stat = SSTP_READY;
@@ -27,7 +28,7 @@ static	void		(*sstpproc)(HWND, char *) = NULL;
 
 static const OEMCHAR sendermes[] = 										\
 					OEMTEXT("SEND SSTP/1.2\r\n")						\
-					OEMTEXT("Sender: Neko Project II\r\n")				\
+					OEMTEXT("Sender: " PROJECTNAME)				\
 					OEMTEXT("Script: \\h\\s0%s\\e\r\n")					\
 					OEMTEXT("Option: notranslate\r\n")					\
 					OEMTEXT("Charset: Shift_JIS\r\n")					\