Module: wine Branch: master Commit: 3b3e1a1ed010c16d766ca3e0cd56decf50d3151c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3e1a1ed010c16d766ca3e0cd...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:30:14 2009 +0200
start: Build language resource files separately.
Do not include them from an other rc file.
---
programs/start/Cs.rc | 2 ++ programs/start/De.rc | 2 ++ programs/start/En.rc | 2 ++ programs/start/Es.rc | 2 ++ programs/start/Fr.rc | 4 ++-- programs/start/It.rc | 2 ++ programs/start/Ko.rc | 2 ++ programs/start/Lt.rc | 4 ++-- programs/start/Makefile.in | 17 ++++++++++++++++- programs/start/Nl.rc | 2 ++ programs/start/No.rc | 2 ++ programs/start/Pl.rc | 2 ++ programs/start/Pt.rc | 2 ++ programs/start/Ru.rc | 2 ++ programs/start/Si.rc | 4 ++-- programs/start/Tr.rc | 2 ++ programs/start/resources.h | 2 ++ programs/start/rsrc.rc | 39 --------------------------------------- 18 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index 1693f8b..fa00dd0 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */ diff --git a/programs/start/De.rc b/programs/start/De.rc index 4f54a53..ac0cdf5 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/start/En.rc b/programs/start/En.rc index 0429fe9..463b6c2 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/start/Es.rc b/programs/start/Es.rc index ac1c6d7..83881c6 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index a2c8fd7..343398e 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
#pragma code_page(65001) /* UTF-8 */ @@ -69,5 +71,3 @@ STRING_EXECFAIL "Le programme n'a pas pu être lancé, ou il n'y a pas de progra
STRING_UNIXFAIL, "Le nom de fichier Unix spécifié n'a pas pu être converti en nom de fichier DOS." } - -#pragma code_page(default) /* Return to default encoding */ diff --git a/programs/start/It.rc b/programs/start/It.rc index 42f59ac..2ba5417 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 871aadc..4435d57 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/programs/start/Lt.rc b/programs/start/Lt.rc index 1717a84..8f0e52b 100644 --- a/programs/start/Lt.rc +++ b/programs/start/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -69,5 +71,3 @@ STRING_EXECFAIL, "Nepavyko paleisti programos arba nėra programos susietos su n
STRING_UNIXFAIL "Nepavyko paversti nurodyto Unix failo pavadinimo į DOS failo pavadinimą." } - -#pragma code_page(default) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 976766f..a96fbce 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -9,7 +9,22 @@ IMPORTS = shell32 user32 kernel32
C_SRCS = start.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Tr.rc
@MAKE_PROG_RULES@
diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 69012a1..50252fa 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/start/No.rc b/programs/start/No.rc index 15b4dbc..5d2da44 100644 --- a/programs/start/No.rc +++ b/programs/start/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 09b9f51..d2df6ea 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 51ff53b..2305509 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE DISCARDABLE diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 97e9854..f30af43 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/start/Si.rc b/programs/start/Si.rc index e10ddf7..0ed1ff9 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -66,5 +68,3 @@ STRING_EXECFAIL "Programa ni mogoče zagnati ali pa z datoteko te vrste ni povez
STRING_UNIXFAIL "Navedenega Unix imena datoteke ni mogoče prevesti v DOS ime datoteke." } - -#pragma code_page(default) diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index de7a69d..fefc94b 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/start/resources.h b/programs/start/resources.h index f5abd31..fd8641d 100644 --- a/programs/start/resources.h +++ b/programs/start/resources.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> + #define STRING_USAGE 101 #define STRING_LICENSE 102 #define STRING_EXECFAIL 103 diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc deleted file mode 100644 index abfee94..0000000 --- a/programs/start/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2003 Dan Kegel - * - * 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 "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "Cs.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Tr.rc"