wineconsole: Build language resource files separately

Michael Stefaniuc mstefani at redhat.de
Tue Jun 30 04:14:06 CDT 2009


instead of including them from an other rc file.
---
 programs/wineconsole/Makefile.in        |   20 +++++++++++++-
 programs/wineconsole/wineconsole_Cs.rc  |    2 +
 programs/wineconsole/wineconsole_De.rc  |    2 +
 programs/wineconsole/wineconsole_En.rc  |    2 +
 programs/wineconsole/wineconsole_Eo.rc  |    2 +
 programs/wineconsole/wineconsole_Es.rc  |    2 +
 programs/wineconsole/wineconsole_Fr.rc  |    2 +
 programs/wineconsole/wineconsole_Hu.rc  |    2 +
 programs/wineconsole/wineconsole_It.rc  |    2 +
 programs/wineconsole/wineconsole_Ko.rc  |    2 +
 programs/wineconsole/wineconsole_Nl.rc  |    2 +
 programs/wineconsole/wineconsole_No.rc  |    2 +
 programs/wineconsole/wineconsole_Pl.rc  |    2 +
 programs/wineconsole/wineconsole_Pt.rc  |    2 +
 programs/wineconsole/wineconsole_Ru.rc  |    2 +
 programs/wineconsole/wineconsole_Si.rc  |    4 +-
 programs/wineconsole/wineconsole_Sv.rc  |    2 +
 programs/wineconsole/wineconsole_Tr.rc  |    2 +
 programs/wineconsole/wineconsole_Zh.rc  |    4 +-
 programs/wineconsole/wineconsole_res.h  |    4 +++
 programs/wineconsole/wineconsole_res.rc |   44 -------------------------------
 21 files changed, 59 insertions(+), 49 deletions(-)
 delete mode 100644 programs/wineconsole/wineconsole_res.rc

diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index 335dd4b..e7aba97 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -15,7 +15,25 @@ C_SRCS = \
 	user.c \
 	wineconsole.c
 
-RC_SRCS = wineconsole_res.rc
+RC_SRCS = \
+	wineconsole_Cs.rc \
+	wineconsole_De.rc \
+	wineconsole_En.rc \
+	wineconsole_Eo.rc \
+	wineconsole_Es.rc \
+	wineconsole_Fr.rc \
+	wineconsole_Hu.rc \
+	wineconsole_It.rc \
+	wineconsole_Ko.rc \
+	wineconsole_Nl.rc \
+	wineconsole_No.rc \
+	wineconsole_Pl.rc \
+	wineconsole_Pt.rc \
+	wineconsole_Ru.rc \
+	wineconsole_Si.rc \
+	wineconsole_Sv.rc \
+	wineconsole_Tr.rc \
+	wineconsole_Zh.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/wineconsole/wineconsole_Cs.rc b/programs/wineconsole/wineconsole_Cs.rc
index b1a46ac..719d70f 100644
--- a/programs/wineconsole/wineconsole_Cs.rc
+++ b/programs/wineconsole/wineconsole_Cs.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/programs/wineconsole/wineconsole_De.rc b/programs/wineconsole/wineconsole_De.rc
index dd6d8dc..4988cd9 100644
--- a/programs/wineconsole/wineconsole_De.rc
+++ b/programs/wineconsole/wineconsole_De.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc
index 624d0fa..a1c2173 100644
--- a/programs/wineconsole/wineconsole_En.rc
+++ b/programs/wineconsole/wineconsole_En.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Eo.rc b/programs/wineconsole/wineconsole_Eo.rc
index 4d031e1..c60a9d1 100644
--- a/programs/wineconsole/wineconsole_Eo.rc
+++ b/programs/wineconsole/wineconsole_Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Es.rc b/programs/wineconsole/wineconsole_Es.rc
index d26dc9f..f1340e4 100644
--- a/programs/wineconsole/wineconsole_Es.rc
+++ b/programs/wineconsole/wineconsole_Es.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc
index 85d2432..63796ec 100644
--- a/programs/wineconsole/wineconsole_Fr.rc
+++ b/programs/wineconsole/wineconsole_Fr.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Hu.rc b/programs/wineconsole/wineconsole_Hu.rc
index 7faf9cc..5a269bf 100644
--- a/programs/wineconsole/wineconsole_Hu.rc
+++ b/programs/wineconsole/wineconsole_Hu.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_It.rc b/programs/wineconsole/wineconsole_It.rc
index d67205c..bc1f901 100644
--- a/programs/wineconsole/wineconsole_It.rc
+++ b/programs/wineconsole/wineconsole_It.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc
index 6b0c8d3..9478590 100644
--- a/programs/wineconsole/wineconsole_Ko.rc
+++ b/programs/wineconsole/wineconsole_Ko.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Nl.rc b/programs/wineconsole/wineconsole_Nl.rc
index 00c77aa..d02fe76 100644
--- a/programs/wineconsole/wineconsole_Nl.rc
+++ b/programs/wineconsole/wineconsole_Nl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_No.rc b/programs/wineconsole/wineconsole_No.rc
index 6bf5fb3..2a11dfb 100644
--- a/programs/wineconsole/wineconsole_No.rc
+++ b/programs/wineconsole/wineconsole_No.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Pl.rc b/programs/wineconsole/wineconsole_Pl.rc
index c19d73b..9ad3799 100644
--- a/programs/wineconsole/wineconsole_Pl.rc
+++ b/programs/wineconsole/wineconsole_Pl.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Pt.rc b/programs/wineconsole/wineconsole_Pt.rc
index 8fc6371..fb80aa1 100644
--- a/programs/wineconsole/wineconsole_Pt.rc
+++ b/programs/wineconsole/wineconsole_Pt.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc
index 0044538..40154a3 100644
--- a/programs/wineconsole/wineconsole_Ru.rc
+++ b/programs/wineconsole/wineconsole_Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Si.rc b/programs/wineconsole/wineconsole_Si.rc
index a39fb15..79b9093 100644
--- a/programs/wineconsole/wineconsole_Si.rc
+++ b/programs/wineconsole/wineconsole_Si.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -135,5 +137,3 @@ FONT 8, "MS Shell Dlg"
 	PUSHBUTTON "V redu", IDOK, 35, 45, 35, 12
     PUSHBUTTON "Prekli??i", IDCANCEL, 80, 45, 35, 12
 }
-
-#pragma code_page(default)
diff --git a/programs/wineconsole/wineconsole_Sv.rc b/programs/wineconsole/wineconsole_Sv.rc
index e80719e..509e876 100644
--- a/programs/wineconsole/wineconsole_Sv.rc
+++ b/programs/wineconsole/wineconsole_Sv.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Tr.rc b/programs/wineconsole/wineconsole_Tr.rc
index 3bd0b29..7642405 100644
--- a/programs/wineconsole/wineconsole_Tr.rc
+++ b/programs/wineconsole/wineconsole_Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/programs/wineconsole/wineconsole_Zh.rc b/programs/wineconsole/wineconsole_Zh.rc
index b03d052..88375bb 100644
--- a/programs/wineconsole/wineconsole_Zh.rc
+++ b/programs/wineconsole/wineconsole_Zh.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "wineconsole_res.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -227,5 +229,3 @@ FONT 9, "MS Shell Dlg"
 	PUSHBUTTON "??????", IDOK, 20, 45, 35, 12
 	PUSHBUTTON "??????", IDCANCEL, 65, 45, 35, 12
 }
-
-#pragma code_page(default)
diff --git a/programs/wineconsole/wineconsole_res.h b/programs/wineconsole/wineconsole_res.h
index b5518fc..a128aa9 100644
--- a/programs/wineconsole/wineconsole_res.h
+++ b/programs/wineconsole/wineconsole_res.h
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
 /* strings */
 #define IDS_EDIT		0x100
 #define IDS_DEFAULT		0x101
diff --git a/programs/wineconsole/wineconsole_res.rc b/programs/wineconsole/wineconsole_res.rc
deleted file mode 100644
index 14e1a2d..0000000
--- a/programs/wineconsole/wineconsole_res.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2001 Eric Pouech
- *
- * 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 "winuser.h"
-#include "winnls.h"
-#include "commctrl.h"
-#include "wineconsole_res.h"
-
-#include "wineconsole_Cs.rc"
-#include "wineconsole_En.rc"
-#include "wineconsole_Eo.rc"
-#include "wineconsole_Fr.rc"
-#include "wineconsole_De.rc"
-#include "wineconsole_Es.rc"
-#include "wineconsole_Hu.rc"
-#include "wineconsole_It.rc"
-#include "wineconsole_Ko.rc"
-#include "wineconsole_Nl.rc"
-#include "wineconsole_No.rc"
-#include "wineconsole_Pl.rc"
-#include "wineconsole_Pt.rc"
-#include "wineconsole_Ru.rc"
-#include "wineconsole_Si.rc"
-#include "wineconsole_Sv.rc"
-#include "wineconsole_Tr.rc"
-#include "wineconsole_Zh.rc"
-- 
1.6.2.5



More information about the wine-patches mailing list