winhlp32: Build language resource files separately.

programs/winhlp32/Bg.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

programs/winhlp32/Cs.rc

@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Czech strings in CP1250 */
 
 /* Menu */

programs/winhlp32/Da.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

programs/winhlp32/De.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

programs/winhlp32/En.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

programs/winhlp32/Eo.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */
 
 /* Menu */

programs/winhlp32/Es.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

programs/winhlp32/Fi.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

programs/winhlp32/Fr.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

programs/winhlp32/Hu.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

programs/winhlp32/It.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

programs/winhlp32/Ja.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -126,5 +128,3 @@ BEGIN
 		MENUITEM "システム カラーを使う",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-
-#pragma code_page(default)

programs/winhlp32/Ko.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

programs/winhlp32/Lt.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -127,5 +129,3 @@ BEGIN
     MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS
   END
 END
-
-#pragma code_page(default)

programs/winhlp32/Makefile.in

@@ -18,7 +18,34 @@ LEX_SRCS = macro.lex.l
 
 EXTRARCFLAGS = -DWINELIB
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Bg.rc \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Eo.rc \
+	Es.rc \
+	Fi.rc \
+	Fr.rc \
+	Hu.rc \
+	It.rc \
+	Ja.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Rm.rc \
+	Ru.rc \
+	Si.rc \
+	Sk.rc \
+	Sv.rc \
+	Tr.rc \
+	Wa.rc \
+	Zh.rc \
+	rsrc.rc
 
 SVG_SRCS = winhelp.svg
 

programs/winhlp32/Nl.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

programs/winhlp32/No.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

programs/winhlp32/Pl.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

programs/winhlp32/Pt.rc

@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

programs/winhlp32/Rm.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* FIXME: This file is in the Vallader Romansh dialect and not in the
    official Rumantsch Grischun. */
 

programs/winhlp32/Ru.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

programs/winhlp32/Si.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 #pragma code_page(65001)
 
 /* Menu */
@@ -124,5 +126,3 @@ BEGIN
 		MENUITEM "Uporabi sistemske barve",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-
-#pragma code_page(default)

programs/winhlp32/Sk.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 {
  POPUP "&Sbor" {

programs/winhlp32/Sv.rc

@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

programs/winhlp32/Tr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Menu */
 
 MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

programs/winhlp32/Wa.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 #ifdef LANG_WALON
 
 /* Menu */

programs/winhlp32/Zh.rc

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "winhelp_res.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -158,5 +160,3 @@ STID_FILE_NOT_FOUND_s	"不能開啟檔案 '%s'. 你想要自己找這個檔案
 STID_NO_RICHEDIT	"找不到 richedit... 終止"
 STID_PSH_INDEX,		"幫助內容: "
 }
-
-#pragma code_page(default)

programs/winhlp32/rsrc.rc

@@ -19,38 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-
-#include "winhelp.h"
 #include "winhelp_res.h"
 
 /* @makedep: winhelp.ico */
 IDI_WINHELP ICON DISCARDABLE winhelp.ico
-
-#include "Bg.rc"
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Eo.rc"
-#include "Es.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Rm.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sk.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Wa.rc"
-#include "Zh.rc"

programs/winhlp32/winhelp_res.h

+#include <windef.h>
+#include <winuser.h>
+
 #define MNID_FILE_OPEN          0x101
 #define MNID_FILE_PRINT         0x104
 #define MNID_FILE_SETUP         0x106