Module: wine Branch: master Commit: 807d75a94e378d053e9b64ea3dcbf68351067cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807d75a94e378d053e9b64ea3d...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:31:26 2009 +0200
winecfg: Build language resource files separately.
Do not include them from an other rc file.
---
programs/winecfg/Bg.rc | 2 ++ programs/winecfg/Cs.rc | 3 +++ programs/winecfg/Da.rc | 2 ++ programs/winecfg/De.rc | 2 ++ programs/winecfg/En.rc | 2 ++ programs/winecfg/Es.rc | 2 ++ programs/winecfg/Fi.rc | 2 ++ programs/winecfg/Fr.rc | 2 ++ programs/winecfg/Hu.rc | 2 ++ programs/winecfg/It.rc | 2 ++ programs/winecfg/Ja.rc | 4 ++-- programs/winecfg/Ko.rc | 2 ++ programs/winecfg/Lt.rc | 4 ++-- programs/winecfg/Makefile.in | 26 +++++++++++++++++++++++++- programs/winecfg/Nl.rc | 2 ++ programs/winecfg/No.rc | 2 ++ programs/winecfg/Pl.rc | 2 ++ programs/winecfg/Pt.rc | 2 ++ programs/winecfg/Ro.rc | 4 ++-- programs/winecfg/Ru.rc | 2 ++ programs/winecfg/Si.rc | 4 ++-- programs/winecfg/Sv.rc | 2 ++ programs/winecfg/Tr.rc | 2 ++ programs/winecfg/Zh.rc | 4 ++-- programs/winecfg/resource.h | 4 ++++ programs/winecfg/winecfg.rc | 33 --------------------------------- 26 files changed, 76 insertions(+), 44 deletions(-)
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index ca9b054..9ddaf2c 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index d9488e5..6f5804b 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -24,6 +24,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "resource.h" + /* Czech strings in CP1250 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 58b68c4..b1df6f6 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index ee49d31..045e709 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 7389ff8..88a6269 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,6 +22,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 690b5e1..e22ada4 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 087320a..211669e 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -21,6 +21,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 90d4fff..628e752 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index ce36e6a..e97c7a4 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 9a259b7..2ee50cb 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index db82eed..eeb0987 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -22,6 +22,8 @@ * */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -327,5 +329,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "メニュー バー" END - -#pragma code_page(default) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 4ee5e5f..151375f 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -23,6 +23,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index c253181..297b411 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -325,5 +327,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Meniu paryškinimas" IDC_SYSPARAMS_MENUBAR "Meniu juosta" END - -#pragma code_page(default) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 823084f..787615b 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -18,7 +18,31 @@ C_SRCS = \ winecfg.c \ x11drvdlg.c
-RC_SRCS = winecfg.rc +RC_SRCS = \ + Bg.rc \ + Cs.rc \ + Da.rc \ + De.rc \ + En.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 \ + Tr.rc \ + Zh.rc \ + winecfg.rc
@MAKE_PROG_RULES@
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index af35977..66bd464 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -22,6 +22,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index bf4611a..2825675 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 73ca62c..f7fb619 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -23,6 +23,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index d96f1b6..a3b0219 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,6 +21,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index e9fd94c..fb8a20b 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -324,5 +326,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Evidențiere meniu" IDC_SYSPARAMS_MENUBAR "Bară de meniu" END - -#pragma code_page(default) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index e51042d..9656c48 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -21,6 +21,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index 016d982..1a8d488 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -324,5 +326,3 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Meni: osvetljen" IDC_SYSPARAMS_MENUBAR "Meni: vrstica" END - -#pragma code_page(default) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 12713b0..5770899 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 8dff20f..dbe1f2f 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -20,6 +20,8 @@ * */
+#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDR_WINECFG MENU DISCARDABLE diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 7f6f36a..349d106 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -21,6 +21,8 @@ * */
+#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -594,5 +596,3 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "非當前標題欄" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "非當前標題欄文字" END - -#pragma code_page(default) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index a18fe76..88c9e64 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -23,6 +23,10 @@ * */
+#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDC_STATIC -1 #define IDS_TAB_APPLICATIONS 2 #define IDS_TAB_DLLS 3 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 6fdc232..7f8fe80 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,41 +20,8 @@ * */
-#include "config.h" /* Needed for the PACKAGE_STRING definition */ -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "winuser.h" -#include "commctrl.h" #include "resource.h"
-#include "Bg.rc" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.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 "Tr.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: idb_wine.bmp */ IDB_WINE BITMAP idb_wine.bmp
-
Alexandre Julliard