From aa41526c73a5fbcc2c08a9342107ee76173a2b97 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 31 May 2009 20:11:00 +0200 Subject: [PATCH] clock: Build resource files separately instead of including them all from a global file. --- programs/clock/Cs.rc | 2 ++ programs/clock/Da.rc | 2 ++ programs/clock/De.rc | 2 ++ programs/clock/En.rc | 2 ++ programs/clock/Eo.rc | 2 ++ programs/clock/Es.rc | 2 ++ programs/clock/Fi.rc | 2 ++ programs/clock/Fr.rc | 2 ++ programs/clock/Hu.rc | 2 ++ programs/clock/It.rc | 2 ++ programs/clock/Ja.rc | 4 ++-- programs/clock/Ko.rc | 2 ++ programs/clock/Makefile.in | 26 +++++++++++++++++++- programs/clock/Nl.rc | 2 ++ programs/clock/No.rc | 2 ++ programs/clock/Pl.rc | 2 ++ programs/clock/Pt.rc | 2 ++ programs/clock/Ru.rc | 2 ++ programs/clock/Si.rc | 4 ++-- programs/clock/Sk.rc | 2 ++ programs/clock/Sv.rc | 2 ++ programs/clock/Th.rc | 2 ++ programs/clock/Tr.rc | 2 ++ programs/clock/Wa.rc | 2 ++ programs/clock/Zh.rc | 4 ++-- programs/clock/clock_res.h | 2 ++ programs/clock/rsrc.rc | 49 -------------------------------------- 27 files changed, 75 insertions(+), 56 deletions(-) delete mode 100644 programs/clock/rsrc.rc diff --git a/programs/clock/Cs.rc b/programs/clock/Cs.rc index b73981a16dd..8b1ba903453 100644 --- a/programs/clock/Cs.rc +++ b/programs/clock/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc index ab4e54897ab..e4006319385 100644 --- a/programs/clock/Da.rc +++ b/programs/clock/Da.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { POPUP "&Instillinger" { diff --git a/programs/clock/De.rc b/programs/clock/De.rc index 53b0014c723..f1e794b4c3f 100644 --- a/programs/clock/De.rc +++ b/programs/clock/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { POPUP "&Einstellungen" { diff --git a/programs/clock/En.rc b/programs/clock/En.rc index 61149431ee1..c381b509181 100644 --- a/programs/clock/En.rc +++ b/programs/clock/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Eo.rc b/programs/clock/Eo.rc index 79e4b06e11e..335ba95195b 100644 --- a/programs/clock/Eo.rc +++ b/programs/clock/Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Es.rc b/programs/clock/Es.rc index bc5753f59be..74b6d960bdb 100644 --- a/programs/clock/Es.rc +++ b/programs/clock/Es.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/programs/clock/Fi.rc b/programs/clock/Fi.rc index 06a97248f92..87d27866f1c 100644 --- a/programs/clock/Fi.rc +++ b/programs/clock/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT { POPUP "&Ominaisuudet" { diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index be800598ac5..ce6aa8d590e 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/programs/clock/Hu.rc b/programs/clock/Hu.rc index e581c10ab00..bced57c5b13 100644 --- a/programs/clock/Hu.rc +++ b/programs/clock/Hu.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT { POPUP "&Beállítások" { diff --git a/programs/clock/It.rc b/programs/clock/It.rc index 82e6fc0c8fa..91970b3d1e4 100644 --- a/programs/clock/It.rc +++ b/programs/clock/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc index b220e790902..10c23e0c687 100644 --- a/programs/clock/Ja.rc +++ b/programs/clock/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + /* UTF-8 */ #pragma code_page(65001) @@ -74,5 +76,3 @@ 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." } - -#pragma code_page(default) diff --git a/programs/clock/Ko.rc b/programs/clock/Ko.rc index f5ee4f0b7e0..e3ea83ad779 100644 --- a/programs/clock/Ko.rc +++ b/programs/clock/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index f69bcf10f85..093ddefbc1e 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -10,7 +10,31 @@ C_SRCS = \ main.c \ winclock.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sk.rc \ + Sv.rc \ + Th.rc \ + Tr.rc \ + Wa.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/clock/Nl.rc b/programs/clock/Nl.rc index 688418a4383..11c6e2dacac 100644 --- a/programs/clock/Nl.rc +++ b/programs/clock/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/programs/clock/No.rc b/programs/clock/No.rc index 97c5b0c7797..9905ffb309c 100644 --- a/programs/clock/No.rc +++ b/programs/clock/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MAIN_MENU MENU diff --git a/programs/clock/Pl.rc b/programs/clock/Pl.rc index 5f6231db08b..bd44d4afff3 100644 --- a/programs/clock/Pl.rc +++ b/programs/clock/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Pt.rc b/programs/clock/Pt.rc index 6948c73b14f..2b045836c0d 100644 --- a/programs/clock/Pt.rc +++ b/programs/clock/Pt.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU diff --git a/programs/clock/Ru.rc b/programs/clock/Ru.rc index 1819e36d1cd..df5b4897c67 100644 --- a/programs/clock/Ru.rc +++ b/programs/clock/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT { POPUP "&Ńâîéńňâŕ" { diff --git a/programs/clock/Si.rc b/programs/clock/Si.rc index 0df817285e0..0e4c28b23d8 100644 --- a/programs/clock/Si.rc +++ b/programs/clock/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -72,5 +74,3 @@ 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." } - -#pragma code_page(default) diff --git a/programs/clock/Sk.rc b/programs/clock/Sk.rc index 8befbc8ab1c..b3ba3121eb0 100644 --- a/programs/clock/Sk.rc +++ b/programs/clock/Sk.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT { POPUP "&Vlastnosti" { diff --git a/programs/clock/Sv.rc b/programs/clock/Sv.rc index 6267c5af764..732435c9ba4 100644 --- a/programs/clock/Sv.rc +++ b/programs/clock/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/programs/clock/Th.rc b/programs/clock/Th.rc index f179475af80..11144b93bfc 100644 --- a/programs/clock/Th.rc +++ b/programs/clock/Th.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_THAI, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Tr.rc b/programs/clock/Tr.rc index 8b94b9e8cbf..0c514aa6b40 100644 --- a/programs/clock/Tr.rc +++ b/programs/clock/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/programs/clock/Wa.rc b/programs/clock/Wa.rc index 21ea5250fd9..48b006d901f 100644 --- a/programs/clock/Wa.rc +++ b/programs/clock/Wa.rc @@ -23,6 +23,8 @@ * */ +#include "clock_res.h" + #ifdef LANG_WALON MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT diff --git a/programs/clock/Zh.rc b/programs/clock/Zh.rc index 5bad6fd6642..2750e57c13b 100644 --- a/programs/clock/Zh.rc +++ b/programs/clock/Zh.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "clock_res.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -79,5 +81,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "時鐘" } - -#pragma code_page(default) diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index 8fd0d24232f..614efc46334 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + #define MAIN_MENU 0x100 #define IDM_ANALOG 0x101 #define IDM_DIGITAL 0x102 diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc deleted file mode 100644 index bf2eb6780da..00000000000 --- a/programs/clock/rsrc.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Clock resources - * - * Copyright 1998 Marcel Baur - * - * 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 "clock_res.h" - -#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 "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sk.rc" -#include "Sv.rc" -#include "Th.rc" -#include "Tr.rc" -#include "Wa.rc" -#include "Zh.rc"