From 6667ef13414a477e1f9d9c3e082a08297e93894f Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 2 Jul 2009 00:31:35 +0200 Subject: [PATCH] winemine: Build language resource files separately. Do not include them from an other rc file. --- programs/winemine/Cs.rc | 2 ++ programs/winemine/Da.rc | 2 ++ programs/winemine/De.rc | 2 ++ programs/winemine/En.rc | 2 ++ programs/winemine/Es.rc | 2 ++ programs/winemine/Fi.rc | 2 ++ programs/winemine/Fr.rc | 2 ++ programs/winemine/It.rc | 2 ++ programs/winemine/Ja.rc | 4 ++-- programs/winemine/Ko.rc | 2 ++ programs/winemine/Lt.rc | 4 ++-- programs/winemine/Makefile.in | 23 ++++++++++++++++++++++- programs/winemine/Nl.rc | 2 ++ programs/winemine/No.rc | 2 ++ programs/winemine/Pl.rc | 2 ++ programs/winemine/Pt.rc | 2 ++ programs/winemine/Ro.rc | 4 ++-- programs/winemine/Ru.rc | 2 ++ programs/winemine/Si.rc | 4 ++-- programs/winemine/Tr.rc | 2 ++ programs/winemine/Zh.rc | 4 ++-- programs/winemine/resource.h | 2 ++ programs/winemine/rsrc.rc | 24 ------------------------ 23 files changed, 64 insertions(+), 35 deletions(-) diff --git a/programs/winemine/Cs.rc b/programs/winemine/Cs.rc index c4f3cc33a63..bfe977016d3 100644 --- a/programs/winemine/Cs.rc +++ b/programs/winemine/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/winemine/Da.rc b/programs/winemine/Da.rc index 3e5631fc0c6..2027e7642db 100644 --- a/programs/winemine/Da.rc +++ b/programs/winemine/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/De.rc b/programs/winemine/De.rc index d1066f9f208..a60dcc2a4d3 100644 --- a/programs/winemine/De.rc +++ b/programs/winemine/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index c0f2550415b..634a3e8606c 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Es.rc b/programs/winemine/Es.rc index c36b522bc9b..0b08162359b 100644 --- a/programs/winemine/Es.rc +++ b/programs/winemine/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Fi.rc b/programs/winemine/Fi.rc index ceee60399a7..6252d2cca5a 100644 --- a/programs/winemine/Fi.rc +++ b/programs/winemine/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Fr.rc b/programs/winemine/Fr.rc index e2a9372b053..fa7d5eca3d7 100644 --- a/programs/winemine/Fr.rc +++ b/programs/winemine/Fr.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/It.rc b/programs/winemine/It.rc index 3291beaaf2c..a799fa491ce 100644 --- a/programs/winemine/It.rc +++ b/programs/winemine/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/Ja.rc b/programs/winemine/Ja.rc index 28530ac9590..d4edbcb16cb 100644 --- a/programs/winemine/Ja.rc +++ b/programs/winemine/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -93,5 +95,3 @@ CAPTION "盤面の変更" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index c27d6e3eef2..bc532e9a4af 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Lt.rc b/programs/winemine/Lt.rc index 692717df727..de09a45b4fb 100644 --- a/programs/winemine/Lt.rc +++ b/programs/winemine/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -92,5 +94,3 @@ CAPTION "Pasirinktas žaidimas" DEFPUSHBUTTON "Gerai", IDOK, 40, 30, 50, 15 PUSHBUTTON "Atsisakyti", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 64f8599c568..09adf9e6e3a 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ dialog.c \ main.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = winemine.svg diff --git a/programs/winemine/Nl.rc b/programs/winemine/Nl.rc index 6d0cf3cff2f..18bbda6b7ed 100644 --- a/programs/winemine/Nl.rc +++ b/programs/winemine/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { diff --git a/programs/winemine/No.rc b/programs/winemine/No.rc index c3ab3d1f2d0..7e06eef0f1a 100644 --- a/programs/winemine/No.rc +++ b/programs/winemine/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { diff --git a/programs/winemine/Pl.rc b/programs/winemine/Pl.rc index 2d924c5c97f..7830eab628d 100644 --- a/programs/winemine/Pl.rc +++ b/programs/winemine/Pl.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Pt.rc b/programs/winemine/Pt.rc index a8f581aaa44..9c20abba1d8 100644 --- a/programs/winemine/Pt.rc +++ b/programs/winemine/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE { diff --git a/programs/winemine/Ro.rc b/programs/winemine/Ro.rc index 9d601ae4253..af0ea37ceb0 100644 --- a/programs/winemine/Ro.rc +++ b/programs/winemine/Ro.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -91,5 +93,3 @@ CAPTION "Joc personalizat" DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 PUSHBUTTON "Renunţă", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Ru.rc b/programs/winemine/Ru.rc index f13fd7ee779..e323e246446 100644 --- a/programs/winemine/Ru.rc +++ b/programs/winemine/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Si.rc b/programs/winemine/Si.rc index 77148c5e2d6..dab867a8d1d 100644 --- a/programs/winemine/Si.rc +++ b/programs/winemine/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -91,5 +93,3 @@ CAPTION "Poljubna igra" DEFPUSHBUTTON "V redu", IDOK, 40, 30, 50, 15 PUSHBUTTON "Prekliči", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/Tr.rc b/programs/winemine/Tr.rc index b09f77de053..174fbdad196 100644 --- a/programs/winemine/Tr.rc +++ b/programs/winemine/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { diff --git a/programs/winemine/Zh.rc b/programs/winemine/Zh.rc index 99777c2731b..e28a2044c52 100644 --- a/programs/winemine/Zh.rc +++ b/programs/winemine/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -162,5 +164,3 @@ CAPTION "自定義遊戲" DEFPUSHBUTTON "確定", IDOK, 40, 30, 50, 15 PUSHBUTTON "取消", IDCANCEL, 40, 50, 50, 15 } - -#pragma code_page(default) diff --git a/programs/winemine/resource.h b/programs/winemine/resource.h index 982c5166ef0..c3272a29d7d 100644 --- a/programs/winemine/resource.h +++ b/programs/winemine/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include +#include #define ID_TIMER 1000 diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 09f5cd38cbb..ce5bcf94f0d 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -19,32 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - #include "resource.h" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.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 "Tr.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL IDA_WINEMINE ACCELERATORS DISCARDABLE