serialui: Build language resource files separately.

Michael Stefaniuc mstefani at redhat.de
Thu Jul 2 05:33:12 CDT 2009


Do not include them from an other rc file.
---
 dlls/serialui/Bg.rc          |    2 +
 dlls/serialui/Cs.rc          |    2 +
 dlls/serialui/Da.rc          |    2 +
 dlls/serialui/De.rc          |    2 +
 dlls/serialui/En.rc          |    2 +
 dlls/serialui/Eo.rc          |    2 +
 dlls/serialui/Es.rc          |    2 +
 dlls/serialui/Fi.rc          |    2 +
 dlls/serialui/Fr.rc          |    2 +
 dlls/serialui/Hu.rc          |    2 +
 dlls/serialui/It.rc          |    2 +
 dlls/serialui/Ja.rc          |    4 +-
 dlls/serialui/Ko.rc          |    2 +
 dlls/serialui/Lt.rc          |    4 +-
 dlls/serialui/Makefile.in    |   24 +++++++++++++++++++++-
 dlls/serialui/Nl.rc          |    2 +
 dlls/serialui/No.rc          |    2 +
 dlls/serialui/Pt.rc          |    2 +
 dlls/serialui/Ru.rc          |    2 +
 dlls/serialui/Si.rc          |    4 +-
 dlls/serialui/Sv.rc          |    2 +
 dlls/serialui/Tr.rc          |    2 +
 dlls/serialui/Zh.rc          |    4 +-
 dlls/serialui/serialui.h     |    3 ++
 dlls/serialui/serialui_rc.rc |   45 ------------------------------------------
 25 files changed, 70 insertions(+), 54 deletions(-)
 delete mode 100644 dlls/serialui/serialui_rc.rc

diff --git a/dlls/serialui/Bg.rc b/dlls/serialui/Bg.rc
index eb6976d..5f1e0f3 100644
--- a/dlls/serialui/Bg.rc
+++ b/dlls/serialui/Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 200, 159
diff --git a/dlls/serialui/Cs.rc b/dlls/serialui/Cs.rc
index 103388e..ec1aae3 100644
--- a/dlls/serialui/Cs.rc
+++ b/dlls/serialui/Cs.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/dlls/serialui/Da.rc b/dlls/serialui/Da.rc
index 7d8e9d6..e0735f6 100644
--- a/dlls/serialui/Da.rc
+++ b/dlls/serialui/Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/De.rc b/dlls/serialui/De.rc
index ffd5148..c7e52fe 100644
--- a/dlls/serialui/De.rc
+++ b/dlls/serialui/De.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/En.rc b/dlls/serialui/En.rc
index 8cebaf3..4ed10df 100644
--- a/dlls/serialui/En.rc
+++ b/dlls/serialui/En.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Eo.rc b/dlls/serialui/Eo.rc
index 41f6ca6..1a82c92 100644
--- a/dlls/serialui/Eo.rc
+++ b/dlls/serialui/Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Es.rc b/dlls/serialui/Es.rc
index c833539..e3f9aff 100644
--- a/dlls/serialui/Es.rc
+++ b/dlls/serialui/Es.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Fi.rc b/dlls/serialui/Fi.rc
index 8f103bd..a5624ba 100644
--- a/dlls/serialui/Fi.rc
+++ b/dlls/serialui/Fi.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Fr.rc b/dlls/serialui/Fr.rc
index 4f09a1e..53c1fe3 100644
--- a/dlls/serialui/Fr.rc
+++ b/dlls/serialui/Fr.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Hu.rc b/dlls/serialui/Hu.rc
index a2666b6..08773cc 100644
--- a/dlls/serialui/Hu.rc
+++ b/dlls/serialui/Hu.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/It.rc b/dlls/serialui/It.rc
index 853b377..18d5df7 100644
--- a/dlls/serialui/It.rc
+++ b/dlls/serialui/It.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Ja.rc b/dlls/serialui/Ja.rc
index dbc8296..ad98bb6 100644
--- a/dlls/serialui/Ja.rc
+++ b/dlls/serialui/Ja.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -42,5 +44,3 @@ BEGIN
   /* PUSHBUTTON    "標準値をロード", ID_GETDEFAULT,30,115,50,14 */
   /* PUSHBUTTON    "標準値として設定", ID_SETDEFAULT,85,115,50,14 */
 END
-
-#pragma code_page(default)
diff --git a/dlls/serialui/Ko.rc b/dlls/serialui/Ko.rc
index c4a5a33..3403a11 100644
--- a/dlls/serialui/Ko.rc
+++ b/dlls/serialui/Ko.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Lt.rc b/dlls/serialui/Lt.rc
index 31e2a95..9cd16d6 100644
--- a/dlls/serialui/Lt.rc
+++ b/dlls/serialui/Lt.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -42,5 +44,3 @@ BEGIN
   /* PUSHBUTTON    "GetDefault", ID_GETDEFAULT,30,115,50,14 */
   /* PUSHBUTTON    "SetDefault", ID_SETDEFAULT,85,115,50,14 */
 END
-
-#pragma code_page(default)
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 3504a5e..8b3f1ca 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -9,7 +9,29 @@ IMPORTS   = user32 advapi32 kernel32
 C_SRCS = \
 	confdlg.c
 
-RC_SRCS= serialui_rc.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 \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/serialui/Nl.rc b/dlls/serialui/Nl.rc
index 1c186da..39feecd 100644
--- a/dlls/serialui/Nl.rc
+++ b/dlls/serialui/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/No.rc b/dlls/serialui/No.rc
index 40d54ca..276868b 100644
--- a/dlls/serialui/No.rc
+++ b/dlls/serialui/No.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Pt.rc b/dlls/serialui/Pt.rc
index 8c66525..6d42420 100644
--- a/dlls/serialui/Pt.rc
+++ b/dlls/serialui/Pt.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Ru.rc b/dlls/serialui/Ru.rc
index be092b4..0234fb5 100644
--- a/dlls/serialui/Ru.rc
+++ b/dlls/serialui/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Si.rc b/dlls/serialui/Si.rc
index f72de24..2098b02 100644
--- a/dlls/serialui/Si.rc
+++ b/dlls/serialui/Si.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -41,5 +43,3 @@ BEGIN
   /* PUSHBUTTON    "GetDefault", ID_GETDEFAULT,30,115,50,14 */
   /* PUSHBUTTON    "SetDefault", ID_SETDEFAULT,85,115,50,14 */
 END
-
-#pragma code_page(default)
diff --git a/dlls/serialui/Sv.rc b/dlls/serialui/Sv.rc
index 069e6c3..8ce0928 100644
--- a/dlls/serialui/Sv.rc
+++ b/dlls/serialui/Sv.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Tr.rc b/dlls/serialui/Tr.rc
index 91ee672..3336fa5 100644
--- a/dlls/serialui/Tr.rc
+++ b/dlls/serialui/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159
diff --git a/dlls/serialui/Zh.rc b/dlls/serialui/Zh.rc
index 967d8c7..adb25c5 100644
--- a/dlls/serialui/Zh.rc
+++ b/dlls/serialui/Zh.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "serialui.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -68,5 +70,3 @@ BEGIN
   /* PUSHBUTTON    "GetDefault", ID_GETDEFAULT,30,115,50,14 */
   /* PUSHBUTTON    "SetDefault", ID_SETDEFAULT,85,115,50,14 */
 END
-
-#pragma code_page(default)
diff --git a/dlls/serialui/serialui.h b/dlls/serialui/serialui.h
index 8eccc35..c4f1bdf 100644
--- a/dlls/serialui/serialui.h
+++ b/dlls/serialui/serialui.h
@@ -19,6 +19,9 @@
 #ifndef __WINE_SERIALUI_H
 #define __WINE_SERIALUI_H
 
+#include <windef.h>
+#include <winuser.h>
+
 #define IDD_SERIALUICONFIG 0x401
 #define IDC_BAUD 0x402
 #define IDC_PARITY 0x0403
diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc
deleted file mode 100644
index 11b3e6c..0000000
--- a/dlls/serialui/serialui_rc.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2000 Mike McCormack
- *
- * 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 "winuser.h"
-#include "serialui.h"
-
-#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 "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
-- 
1.6.3.3



More information about the wine-patches mailing list