From 7cf2855cf76bd21ec996339a2982b0d6b9e1506d Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Wed, 1 Jul 2009 10:15:45 +0200 Subject: [PATCH] winedbg: Build language resource files separately. 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 | 5 ++--- 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(+), 40 deletions(-) delete mode 100644 programs/winedbg/rsrc.rc diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index b4dd150e1e3..9147f1b1727 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 49d19ef364c..11c2cb9c11d 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 +#include #define IDD_CRASH_DLG 100 diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc deleted file mode 100644 index 604c54d7ec6..00000000000 --- 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 -#include - -#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 da04942544f..360f1569fb8 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 3d580c4d063..0919c730554 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 a483c292115..4fb6d42881a 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) @@ -54,6 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" IDS_UNIDENTIFIED "(non identifié)" END - -#pragma code_page(default) - diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc index 457212f17a6..a68deacdc7f 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 7b49d8def4b..6aa5ca4f481 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 01be67bfe22..e2e23e8d342 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 7fc05bb9cac..622ff7b4d76 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