[PATCH 2/2] winedbg: Build language resource files separately.

[Michael Stefaniuc]

Do not include them from an other rc file.
---
 programs/winedbg/Makefile.in |    9 ++++++++-
 programs/winedbg/resource.h  |    2 ++
 programs/winedbg/rsrc.rc     |   32 --------------------------------
 programs/winedbg/rsrc_De.rc  |    4 ++--
 programs/winedbg/rsrc_En.rc  |    2 ++
 programs/winedbg/rsrc_Fr.rc  |    4 ++--
 programs/winedbg/rsrc_Ko.rc  |    2 ++
 programs/winedbg/rsrc_Lt.rc  |    4 ++--
 programs/winedbg/rsrc_Nl.rc  |    2 ++
 programs/winedbg/rsrc_Ru.rc  |    2 ++
 10 files changed, 24 insertions(+), 39 deletions(-)
 delete mode 100644 programs/winedbg/rsrc.rc

diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index b4dd150..9147f1b 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -30,7 +30,14 @@ C_SRCS = \
 	types.c \
 	winedbg.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	rsrc_De.rc \
+	rsrc_En.rc \
+	rsrc_Fr.rc \
+	rsrc_Ko.rc \
+	rsrc_Lt.rc \
+	rsrc_Nl.rc \
+	rsrc_Ru.rc
 
 LEX_SRCS   = debug.l
 BISON_SRCS = dbg.y
diff --git a/programs/winedbg/resource.h b/programs/winedbg/resource.h
index 49d19ef..11c2cb9 100644
--- a/programs/winedbg/resource.h
+++ b/programs/winedbg/resource.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
 
 #define IDD_CRASH_DLG   100
 
diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc
deleted file mode 100644
index 604c54d..0000000
--- a/programs/winedbg/rsrc.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Resources (rsrc.rc)
- *
- * Copyright 2008 Mikolaj Zalewski
- *
- * 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 <winuser.h>
-
-#include "resource.h"
-
-#include "rsrc_De.rc"
-#include "rsrc_En.rc"
-#include "rsrc_Fr.rc"
-#include "rsrc_Ko.rc"
-#include "rsrc_Lt.rc"
-#include "rsrc_Nl.rc"
-#include "rsrc_Ru.rc"
diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc
index da04942..360f156 100644
--- a/programs/winedbg/rsrc_De.rc
+++ b/programs/winedbg/rsrc_De.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
@@ -53,5 +55,3 @@ BEGIN
     IDS_INVALID_PARAMS   "Interne Fehler - ungültige Parameter empfangen"
     IDS_UNIDENTIFIED     "(unbekannt)"
 END
-
-#pragma code_page(default)
diff --git a/programs/winedbg/rsrc_En.rc b/programs/winedbg/rsrc_En.rc
index 3d580c4..0919c73 100644
--- a/programs/winedbg/rsrc_En.rc
+++ b/programs/winedbg/rsrc_En.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDM_DEBUG_POPUP MENU
diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc
index a483c29..ded7315 100644
--- a/programs/winedbg/rsrc_Fr.rc
+++ b/programs/winedbg/rsrc_Fr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -55,5 +57,3 @@ BEGIN
     IDS_UNIDENTIFIED     "(non identifié)"
 END
 
-#pragma code_page(default)
-
diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc
index 457212f..a68deac 100644
--- a/programs/winedbg/rsrc_Ko.rc
+++ b/programs/winedbg/rsrc_Ko.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 IDM_DEBUG_POPUP MENU
diff --git a/programs/winedbg/rsrc_Lt.rc b/programs/winedbg/rsrc_Lt.rc
index 7b49d8d..6aa5ca4 100644
--- a/programs/winedbg/rsrc_Lt.rc
+++ b/programs/winedbg/rsrc_Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -54,5 +56,3 @@ BEGIN
     IDS_INVALID_PARAMS   "VidinÄ—s klaidos - gauti neteisingi parametrai"
     IDS_UNIDENTIFIED     "(nenustatytas)"
 END
-
-#pragma code_page(default)
diff --git a/programs/winedbg/rsrc_Nl.rc b/programs/winedbg/rsrc_Nl.rc
index 01be67b..e2e23e8 100644
--- a/programs/winedbg/rsrc_Nl.rc
+++ b/programs/winedbg/rsrc_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
 
 IDM_DEBUG_POPUP MENU
diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc
index 7fc05bb..622ff7b 100644
--- a/programs/winedbg/rsrc_Ru.rc
+++ b/programs/winedbg/rsrc_Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDM_DEBUG_POPUP MENU
-- 
1.6.3.3