notepad: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Wed Jul 1 17:29:04 CDT 2009


Do not include them from an other rc file.
---
 programs/notepad/Bg.rc         |    2 ++
 programs/notepad/Cs.rc         |    2 ++
 programs/notepad/Da.rc         |    2 ++
 programs/notepad/De.rc         |    2 ++
 programs/notepad/En.rc         |    2 ++
 programs/notepad/Eo.rc         |    2 ++
 programs/notepad/Es.rc         |    2 ++
 programs/notepad/Fi.rc         |    2 ++
 programs/notepad/Fr.rc         |    2 ++
 programs/notepad/Hu.rc         |    2 ++
 programs/notepad/It.rc         |    2 ++
 programs/notepad/Ja.rc         |    4 ++--
 programs/notepad/Ko.rc         |    2 ++
 programs/notepad/Lt.rc         |    3 ++-
 programs/notepad/Makefile.in   |   29 ++++++++++++++++++++++++++++-
 programs/notepad/Nl.rc         |    2 ++
 programs/notepad/No.rc         |    2 ++
 programs/notepad/Pl.rc         |    2 ++
 programs/notepad/Pt.rc         |    2 ++
 programs/notepad/Ro.rc         |    4 ++--
 programs/notepad/Ru.rc         |    2 ++
 programs/notepad/Si.rc         |    4 ++--
 programs/notepad/Sv.rc         |    2 ++
 programs/notepad/Th.rc         |    2 ++
 programs/notepad/Tr.rc         |    2 ++
 programs/notepad/Wa.rc         |    2 ++
 programs/notepad/Zh.rc         |    4 ++--
 programs/notepad/notepad_res.h |    3 +++
 programs/notepad/rsrc.rc       |   33 ---------------------------------
 29 files changed, 83 insertions(+), 43 deletions(-)

diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc
index 2a8dcad..85fb4fc 100644
--- a/programs/notepad/Bg.rc
+++ b/programs/notepad/Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Cs.rc b/programs/notepad/Cs.rc
index f2720e5..745062d 100644
--- a/programs/notepad/Cs.rc
+++ b/programs/notepad/Cs.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc
index 5454ea2..d152cfe 100644
--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc
index fb315a8..2e7154a 100644
--- a/programs/notepad/De.rc
+++ b/programs/notepad/De.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc
index c4a4baf..68edf51 100644
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Eo.rc b/programs/notepad/Eo.rc
index 7b75244..9aafbef 100644
--- a/programs/notepad/Eo.rc
+++ b/programs/notepad/Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc
index ae1e0f7..d73f167 100644
--- a/programs/notepad/Es.rc
+++ b/programs/notepad/Es.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc
index bd4b204..7d152f7 100644
--- a/programs/notepad/Fi.rc
+++ b/programs/notepad/Fi.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc
index 506fd52..d46711c 100644
--- a/programs/notepad/Fr.rc
+++ b/programs/notepad/Fr.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc
index 9bf2986..e1251b5 100644
--- a/programs/notepad/Hu.rc
+++ b/programs/notepad/Hu.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 {
  POPUP "&Fájl" {
diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc
index 755b08a..b8fb42a 100644
--- a/programs/notepad/It.rc
+++ b/programs/notepad/It.rc
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc
index 1ad4062..fcb8168 100644
--- a/programs/notepad/Ja.rc
+++ b/programs/notepad/Ja.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -123,5 +125,3 @@ STRING_OUT_OF_MEMORY,                   "この操作を実行するためのメ
 下さい。"
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc
index 3b4e5d4..b838cbf 100644
--- a/programs/notepad/Ko.rc
+++ b/programs/notepad/Ko.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc
index c3ccfb9..0a12305 100644
--- a/programs/notepad/Lt.rc
+++ b/programs/notepad/Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -120,4 +122,3 @@ STRING_OUT_OF_MEMORY,                  "Neužtenka atminties operacijai užbaigt
                                        NorÄ—dami atlaisvinti atminties uždarykite vienÄ
 ar daugiau programų."
 
 }
-#pragma code_page(default)
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index fcdc872..c48acf7 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -13,7 +13,34 @@ C_SRCS = \
 	dialog.c \
 	main.c
 
-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 \
+	Ro.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Th.rc \
+	Tr.rc \
+	Wa.rc \
+	Zh.rc \
+	rsrc.rc
 
 SVG_SRCS = notepad.svg
 
diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc
index e4d1221..77ee3e1 100644
--- a/programs/notepad/Nl.rc
+++ b/programs/notepad/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc
index 6692561..fe3f19e 100644
--- a/programs/notepad/No.rc
+++ b/programs/notepad/No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc
index c05c715..f7dbfe0 100644
--- a/programs/notepad/Pl.rc
+++ b/programs/notepad/Pl.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc
index b9ef4d9..8ad0809 100644
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc
index 9685de9..a00be21 100644
--- a/programs/notepad/Ro.rc
+++ b/programs/notepad/Ro.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -114,5 +116,3 @@ STRING_NOTFOUND,                "'%s' nu a fost găsit."
 STRING_OUT_OF_MEMORY,           "Nu este destulă memorie pentru a completa această sarcină.\nÎnchideți una sau mai multe aplicații pentru a mări memoria liberă."
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc
index 439c1eb..6e9f64e 100644
--- a/programs/notepad/Ru.rc
+++ b/programs/notepad/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc
index a1ffc73..57a8071 100644
--- a/programs/notepad/Si.rc
+++ b/programs/notepad/Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -119,5 +121,3 @@ STRING_OUT_OF_MEMORY,                   "Za dokončanje operacije je na voljo pr
 pomnilnika.\nZaprite enega ali več programov in poskusite znova."
 
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc
index 7e4aa29..f2893b0 100644
--- a/programs/notepad/Sv.rc
+++ b/programs/notepad/Sv.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Th.rc b/programs/notepad/Th.rc
index 988a392..10a6db5 100644
--- a/programs/notepad/Th.rc
+++ b/programs/notepad/Th.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Tr.rc b/programs/notepad/Tr.rc
index 172193c..31b0265 100644
--- a/programs/notepad/Tr.rc
+++ b/programs/notepad/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc
index 88f2068..1856490 100644
--- a/programs/notepad/Wa.rc
+++ b/programs/notepad/Wa.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 #ifdef LANG_WALON
 
 LANGUAGE LANG_WALON, SUBLANG_DEFAULT
diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc
index 040b8cc..005c67d 100644
--- a/programs/notepad/Zh.rc
+++ b/programs/notepad/Zh.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "notepad_res.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -212,5 +214,3 @@ STRING_NOTSAVED,       "檔案 '%s'\n正文已更改\n\n是否儲存更改?"
 STRING_NOTFOUND,       "找不到: '%s'"
 STRING_OUT_OF_MEMORY,  "沒有足夠的å
§å­˜ä¾†å®Œæˆæ­¤é 
任務,\n請關閉一些程式後再試。"
 }
-
-#pragma code_page(default)
diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h
index 8176b85..e8e6317 100644
--- a/programs/notepad/notepad_res.h
+++ b/programs/notepad/notepad_res.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 #define MAIN_MENU               0x201
 #define DIALOG_PAGESETUP        0x202
 #define ID_ACCEL                0x203
diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc
index 50b3558..f796d92 100644
--- a/programs/notepad/rsrc.rc
+++ b/programs/notepad/rsrc.rc
@@ -17,12 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "main.h"
-#include "winnls.h"
-#include "commctrl.h"
 #include "notepad_res.h"
 
 ID_ACCEL ACCELERATORS
@@ -47,30 +41,3 @@ ID_ACCEL ACCELERATORS
 
 /* @makedep: notepad.ico */
 IDI_NOTEPAD ICON "notepad.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 "Ro.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Th.rc"
-#include "Tr.rc"
-#include "Wa.rc"
-#include "Zh.rc"
-- 
1.6.3.3



More information about the wine-patches mailing list