diff --git a/programs/winhlp32/Bg.rc b/programs/winhlp32/Bg.rc index c59d4e24625..e6d3143db24 100644 --- a/programs/winhlp32/Bg.rc +++ b/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 diff --git a/programs/winhlp32/Cs.rc b/programs/winhlp32/Cs.rc index 15cbf02693d..a8f8db31a26 100644 --- a/programs/winhlp32/Cs.rc +++ b/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 */ diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index 927fc32079f..fc15eeba7d5 100644 --- a/programs/winhlp32/Da.rc +++ b/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 diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc index c8ee650ccca..f429fccb3d5 100644 --- a/programs/winhlp32/De.rc +++ b/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 diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc index 2a11e1a33c2..cff0c6d1a8b 100644 --- a/programs/winhlp32/En.rc +++ b/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 diff --git a/programs/winhlp32/Eo.rc b/programs/winhlp32/Eo.rc index adb98160912..adf288da7f0 100644 --- a/programs/winhlp32/Eo.rc +++ b/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 */ diff --git a/programs/winhlp32/Es.rc b/programs/winhlp32/Es.rc index eee0e17e26a..e752950bcd9 100644 --- a/programs/winhlp32/Es.rc +++ b/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 diff --git a/programs/winhlp32/Fi.rc b/programs/winhlp32/Fi.rc index a1564e68adf..5585619e4ed 100644 --- a/programs/winhlp32/Fi.rc +++ b/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 diff --git a/programs/winhlp32/Fr.rc b/programs/winhlp32/Fr.rc index 0c5eea63f12..62a12c2392d 100644 --- a/programs/winhlp32/Fr.rc +++ b/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 diff --git a/programs/winhlp32/Hu.rc b/programs/winhlp32/Hu.rc index 39beb19c641..ef3a1ee2bc3 100644 --- a/programs/winhlp32/Hu.rc +++ b/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 diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc index 70c158780e9..5d1abb8c92c 100644 --- a/programs/winhlp32/It.rc +++ b/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 diff --git a/programs/winhlp32/Ja.rc b/programs/winhlp32/Ja.rc index bd88b5d6fad..b73d18dd192 100644 --- a/programs/winhlp32/Ja.rc +++ b/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) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 68931789c60..8b4c785ed0c 100644 --- a/programs/winhlp32/Ko.rc +++ b/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 diff --git a/programs/winhlp32/Lt.rc b/programs/winhlp32/Lt.rc index 070e716db86..f8e78681aae 100644 --- a/programs/winhlp32/Lt.rc +++ b/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) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 479656433be..d9635583fc0 100644 --- a/programs/winhlp32/Makefile.in +++ b/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 diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 6a8747a859e..35daef7d672 100644 --- a/programs/winhlp32/Nl.rc +++ b/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 diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc index 5f3e3101c46..2cf2a782372 100644 --- a/programs/winhlp32/No.rc +++ b/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 diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index 17d5d22e346..75047892180 100644 --- a/programs/winhlp32/Pl.rc +++ b/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 diff --git a/programs/winhlp32/Pt.rc b/programs/winhlp32/Pt.rc index fd27a65b55f..9a12e58f096 100644 --- a/programs/winhlp32/Pt.rc +++ b/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 diff --git a/programs/winhlp32/Rm.rc b/programs/winhlp32/Rm.rc index 1339b39e189..ece7bb17c4d 100644 --- a/programs/winhlp32/Rm.rc +++ b/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. */ diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index af0097b7eea..e2e6ef2f5c5 100644 --- a/programs/winhlp32/Ru.rc +++ b/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 diff --git a/programs/winhlp32/Si.rc b/programs/winhlp32/Si.rc index a742cafe05b..527b45431ee 100644 --- a/programs/winhlp32/Si.rc +++ b/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) diff --git a/programs/winhlp32/Sk.rc b/programs/winhlp32/Sk.rc index f8338323dee..1b45e1fe89e 100644 --- a/programs/winhlp32/Sk.rc +++ b/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" { diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc index d3893284cae..935b618909b 100644 --- a/programs/winhlp32/Sv.rc +++ b/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 diff --git a/programs/winhlp32/Tr.rc b/programs/winhlp32/Tr.rc index bbff7236580..876f33caa2f 100644 --- a/programs/winhlp32/Tr.rc +++ b/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 diff --git a/programs/winhlp32/Wa.rc b/programs/winhlp32/Wa.rc index 1e44e4770fc..f19ac84e4c3 100644 --- a/programs/winhlp32/Wa.rc +++ b/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 */ diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc index c0ed0176d77..ed20356cf47 100644 --- a/programs/winhlp32/Zh.rc +++ b/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) diff --git a/programs/winhlp32/rsrc.rc b/programs/winhlp32/rsrc.rc index 9ec7560c95b..39652f4d2cb 100644 --- a/programs/winhlp32/rsrc.rc +++ b/programs/winhlp32/rsrc.rc @@ -19,38 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#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" diff --git a/programs/winhlp32/winhelp_res.h b/programs/winhlp32/winhelp_res.h index e1c72ff54e0..ba2f9799d25 100644 --- a/programs/winhlp32/winhelp_res.h +++ b/programs/winhlp32/winhelp_res.h @@ -1,3 +1,6 @@ +#include +#include + #define MNID_FILE_OPEN 0x101 #define MNID_FILE_PRINT 0x104 #define MNID_FILE_SETUP 0x106