wineboot: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Wed Jul 1 17:30:39 CDT 2009


Do not include them from an other rc file.
---
 programs/wineboot/Makefile.in    |   19 ++++++++++++++-
 programs/wineboot/resource.h     |    3 ++
 programs/wineboot/wineboot.rc    |   46 --------------------------------------
 programs/wineboot/wineboot_Da.rc |    2 +
 programs/wineboot/wineboot_De.rc |    2 +
 programs/wineboot/wineboot_En.rc |    2 +
 programs/wineboot/wineboot_Es.rc |    5 ++-
 programs/wineboot/wineboot_Fr.rc |    5 ++-
 programs/wineboot/wineboot_Ja.rc |    4 +-
 programs/wineboot/wineboot_Ko.rc |    2 +
 programs/wineboot/wineboot_Lt.rc |    4 +-
 programs/wineboot/wineboot_Nl.rc |    2 +
 programs/wineboot/wineboot_No.rc |    2 +
 programs/wineboot/wineboot_Pl.rc |    2 +
 programs/wineboot/wineboot_Pt.rc |    2 +
 programs/wineboot/wineboot_Ro.rc |    4 +-
 programs/wineboot/wineboot_Ru.rc |    2 +
 programs/wineboot/wineboot_Si.rc |    4 +-
 programs/wineboot/wineboot_Sv.rc |    2 +
 programs/wineboot/wineboot_Zh.rc |    4 +-
 20 files changed, 57 insertions(+), 61 deletions(-)
 delete mode 100644 programs/wineboot/wineboot.rc

diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index 63c6fd8..2109457 100644
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@@ -12,7 +12,24 @@ C_SRCS = \
 	shutdown.c \
 	wineboot.c
 
-RC_SRCS = wineboot.rc
+RC_SRCS = \
+	wineboot_Da.rc \
+	wineboot_De.rc \
+	wineboot_En.rc \
+	wineboot_Es.rc \
+	wineboot_Fr.rc \
+	wineboot_Ja.rc \
+	wineboot_Ko.rc \
+	wineboot_Lt.rc \
+	wineboot_Nl.rc \
+	wineboot_No.rc \
+	wineboot_Pl.rc \
+	wineboot_Pt.rc \
+	wineboot_Ro.rc \
+	wineboot_Ru.rc \
+	wineboot_Si.rc \
+	wineboot_Sv.rc \
+	wineboot_Zh.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/wineboot/resource.h b/programs/wineboot/resource.h
index 3838922..a59454a 100644
--- a/programs/wineboot/resource.h
+++ b/programs/wineboot/resource.h
@@ -16,5 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "windef.h"
+#include "winuser.h"
+
 #define IDC_STATIC          -1
 #define IDD_ENDTASK         100
diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc
deleted file mode 100644
index 3ca5d01..0000000
--- a/programs/wineboot/wineboot.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * WineBoot resources
- *
- * Copyright (C) 2007 Robert Shearman for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winnls.h"
-#include "winuser.h"
-#include "commctrl.h"
-#include "resource.h"
-
-#include "wineboot_Da.rc"
-#include "wineboot_De.rc"
-#include "wineboot_En.rc"
-#include "wineboot_Es.rc"
-#include "wineboot_Fr.rc"
-#include "wineboot_Ja.rc"
-#include "wineboot_Ko.rc"
-#include "wineboot_Lt.rc"
-#include "wineboot_Nl.rc"
-#include "wineboot_No.rc"
-#include "wineboot_Pl.rc"
-#include "wineboot_Pt.rc"
-#include "wineboot_Ro.rc"
-#include "wineboot_Ru.rc"
-#include "wineboot_Si.rc"
-#include "wineboot_Sv.rc"
-#include "wineboot_Zh.rc"
diff --git a/programs/wineboot/wineboot_Da.rc b/programs/wineboot/wineboot_Da.rc
index 5e52915..b2730a4 100644
--- a/programs/wineboot/wineboot_Da.rc
+++ b/programs/wineboot/wineboot_Da.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_De.rc b/programs/wineboot/wineboot_De.rc
index 8582dbf..bc44ac8 100644
--- a/programs/wineboot/wineboot_De.rc
+++ b/programs/wineboot/wineboot_De.rc
@@ -20,6 +20,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc
index 8e06aec..4070b72 100644
--- a/programs/wineboot/wineboot_En.rc
+++ b/programs/wineboot/wineboot_En.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc
index 229eaba..359cdd2 100644
--- a/programs/wineboot/wineboot_Es.rc
+++ b/programs/wineboot/wineboot_Es.rc
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
+
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -34,5 +37,3 @@ BEGIN
     LTEXT           "Si termina el programa puede perder los datos no grabados.",
                     IDC_STATIC,7,28,172,15
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc
index b24c5d1..6229e90 100644
--- a/programs/wineboot/wineboot_Fr.rc
+++ b/programs/wineboot/wineboot_Fr.rc
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
+
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -34,5 +37,3 @@ BEGIN
     LTEXT           "Si vous arrêtez le programme, vous pouvez perdre toutes les données non enregistrées.",
                     IDC_STATIC,7,28,172,15
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Ja.rc b/programs/wineboot/wineboot_Ja.rc
index 90f252a..cee0bd2 100644
--- a/programs/wineboot/wineboot_Ja.rc
+++ b/programs/wineboot/wineboot_Ja.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -36,5 +38,3 @@ BEGIN
     LTEXT           "プロセスを終了させると、保存していないデータはå
¨ã¦å¤±ã‚ã‚Œã¾ã™ã€‚",
                     IDC_STATIC,7,28,262,15
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Ko.rc b/programs/wineboot/wineboot_Ko.rc
index a84d6ac..28bcd4b 100644
--- a/programs/wineboot/wineboot_Ko.rc
+++ b/programs/wineboot/wineboot_Ko.rc
@@ -20,6 +20,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 
diff --git a/programs/wineboot/wineboot_Lt.rc b/programs/wineboot/wineboot_Lt.rc
index 4edf2bc..7db56e9 100644
--- a/programs/wineboot/wineboot_Lt.rc
+++ b/programs/wineboot/wineboot_Lt.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -36,5 +38,3 @@ BEGIN
     LTEXT           "Jei nutrauksite procesÄ
, tai galite prarasti visus neišsaugotus duomenis.",
                     IDC_STATIC,7,28,172,17
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Nl.rc b/programs/wineboot/wineboot_Nl.rc
index 86fc337..c22a5c5 100644
--- a/programs/wineboot/wineboot_Nl.rc
+++ b/programs/wineboot/wineboot_Nl.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_No.rc b/programs/wineboot/wineboot_No.rc
index b8ce1f5..d821945 100644
--- a/programs/wineboot/wineboot_No.rc
+++ b/programs/wineboot/wineboot_No.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Pl.rc b/programs/wineboot/wineboot_Pl.rc
index c2460fd..3172d36 100644
--- a/programs/wineboot/wineboot_Pl.rc
+++ b/programs/wineboot/wineboot_Pl.rc
@@ -20,6 +20,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Pt.rc b/programs/wineboot/wineboot_Pt.rc
index ae5561d..a0338ca 100644
--- a/programs/wineboot/wineboot_Pt.rc
+++ b/programs/wineboot/wineboot_Pt.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Ro.rc b/programs/wineboot/wineboot_Ro.rc
index 5639882..61f670f 100644
--- a/programs/wineboot/wineboot_Ro.rc
+++ b/programs/wineboot/wineboot_Ro.rc
@@ -20,6 +20,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -36,5 +38,3 @@ BEGIN
     LTEXT           "Prin terminarea acestui proces se pot pierde datele nesalvate.",
                     IDC_STATIC,7,28,172,15
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Ru.rc b/programs/wineboot/wineboot_Ru.rc
index cb1a9d3..b1ab0ca 100644
--- a/programs/wineboot/wineboot_Ru.rc
+++ b/programs/wineboot/wineboot_Ru.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc
index 1cbc097..366f170 100644
--- a/programs/wineboot/wineboot_Si.rc
+++ b/programs/wineboot/wineboot_Si.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -35,5 +37,3 @@ BEGIN
     LTEXT           "Če se odločite za končanje programa, lahko izgubite neshranjene podatke.",
                     IDC_STATIC,7,28,172,15
 END
-
-#pragma code_page(default)
diff --git a/programs/wineboot/wineboot_Sv.rc b/programs/wineboot/wineboot_Sv.rc
index 6877735..046432b 100644
--- a/programs/wineboot/wineboot_Sv.rc
+++ b/programs/wineboot/wineboot_Sv.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 IDD_ENDTASK DIALOG DISCARDABLE  0, 0, 186, 71
diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc
index 75c56d3..d85f9d4 100644
--- a/programs/wineboot/wineboot_Zh.rc
+++ b/programs/wineboot/wineboot_Zh.rc
@@ -19,6 +19,8 @@
  *
  */
 
+#include "resource.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -51,5 +53,3 @@ BEGIN
     LTEXT           "如果你中斷進程,有可能丟失沒有儲存的數據.",
                     IDC_STATIC,7,28,172,15
 END
-
-#pragma code_page(default)
-- 
1.6.3.3



More information about the wine-patches mailing list