From c135e063c431aafdeb5a6f57ddf0d12341b3c74e Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 2 Jul 2009 00:30:31 +0200 Subject: [PATCH] view: Build language resource files separately. Do not include them from an other rc file. --- programs/view/Cs.rc | 2 ++ programs/view/Da.rc | 2 ++ programs/view/De.rc | 2 ++ programs/view/En.rc | 2 ++ programs/view/Eo.rc | 2 ++ programs/view/Es.rc | 2 ++ programs/view/Fr.rc | 2 ++ programs/view/It.rc | 2 ++ programs/view/Ja.rc | 4 ++-- programs/view/Ko.rc | 2 ++ programs/view/Lt.rc | 4 ++-- programs/view/Makefile.in | 23 +++++++++++++++++- programs/view/Nl.rc | 2 ++ programs/view/No.rc | 2 ++ programs/view/Pl.rc | 2 ++ programs/view/Pt.rc | 2 ++ programs/view/Ro.rc | 4 ++-- programs/view/Ru.rc | 2 ++ programs/view/Si.rc | 4 ++-- programs/view/Sv.rc | 2 ++ programs/view/Tr.rc | 2 ++ programs/view/Zh.rc | 4 ++-- programs/view/resource.h | 2 ++ programs/view/viewrc.rc | 49 --------------------------------------- 24 files changed, 66 insertions(+), 60 deletions(-) delete mode 100644 programs/view/viewrc.rc diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc index ca341213e71..58ee9ca2583 100644 --- a/programs/view/Cs.rc +++ b/programs/view/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/view/Da.rc b/programs/view/Da.rc index 91fd214bef9..8996cf83271 100644 --- a/programs/view/Da.rc +++ b/programs/view/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/view/De.rc b/programs/view/De.rc index 5e7cf31b4b5..b77fc829d39 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/En.rc b/programs/view/En.rc index 042f303e9f1..b2012904bc8 100644 --- a/programs/view/En.rc +++ b/programs/view/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Eo.rc b/programs/view/Eo.rc index bcdeba72e8d..bc61a8d2fdb 100644 --- a/programs/view/Eo.rc +++ b/programs/view/Eo.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT /* diff --git a/programs/view/Es.rc b/programs/view/Es.rc index f1b897d8e81..e0f53f3d7e3 100644 --- a/programs/view/Es.rc +++ b/programs/view/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index b2ab0a4cce4..786a63d2b59 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/It.rc b/programs/view/It.rc index 37747ce3c46..0839c44dc2b 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc index 46c8e11320c..0b692169502 100644 --- a/programs/view/Ja.rc +++ b/programs/view/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -72,5 +74,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "標準メタファイル ビュアー" END - -#pragma code_page(default) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 5df207b7ea8..34516265a87 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc index cbce3bbf464..fdcf731eba6 100644 --- a/programs/view/Lt.rc +++ b/programs/view/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -71,5 +73,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" END - -#pragma code_page(default) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 134a2b4fc20..ff345323f34 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ view.c \ winmain.c -RC_SRCS = viewrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 34a9d4f9318..623506b7dad 100644 --- a/programs/view/Nl.rc +++ b/programs/view/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 /* diff --git a/programs/view/No.rc b/programs/view/No.rc index e7289663b98..4a18853ce98 100644 --- a/programs/view/No.rc +++ b/programs/view/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/view/Pl.rc b/programs/view/Pl.rc index 3f3e93717b7..28828d8298e 100644 --- a/programs/view/Pl.rc +++ b/programs/view/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index 47aab014002..30030809b9c 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* * * Menu diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc index b03fe31a452..8c05f066e33 100644 --- a/programs/view/Ro.rc +++ b/programs/view/Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -69,5 +71,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" END - -#pragma code_page(default) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index cbdc28eac8a..9d4d39e8f63 100644 --- a/programs/view/Ru.rc +++ b/programs/view/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 /* diff --git a/programs/view/Si.rc b/programs/view/Si.rc index 8cb4988c068..8e6a0f2ea01 100644 --- a/programs/view/Si.rc +++ b/programs/view/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -70,5 +72,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Program za ogled Metafile slik" END - -#pragma code_page(default) diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc index b1bb50d9887..2f7eea3a223 100644 --- a/programs/view/Sv.rc +++ b/programs/view/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Tr.rc b/programs/view/Tr.rc index 38ed8490ae9..3e6ea6ff194 100644 --- a/programs/view/Tr.rc +++ b/programs/view/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 84bd638481a..05067f8fbfb 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -120,5 +122,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "普通 Metafile 閱讀器" END - -#pragma code_page(default) diff --git a/programs/view/resource.h b/programs/view/resource.h index 619da492d33..79326879fdc 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + #define IDS_DESCRIPTION 2 #define IDI_APPICON 101 #define IDM_EXIT 1000 diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc deleted file mode 100644 index 6217cf6487d..00000000000 --- a/programs/view/viewrc.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 1998 Douglas Ridgway - * - * 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 "resource.h" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Eo.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -/* - * Icon - */ - -/*IDI_APPICON ICON DISCARDABLE "view.ico"*/