Module: wine Branch: master Commit: 937d70203ef9e94313940c0bd9a3e4c05b584f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=937d70203ef9e94313940c0bd9...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:32:00 2009 +0200
write: Build language resource files separately.
Do not include them from an other rc file.
---
programs/write/De.rc | 2 ++ programs/write/En.rc | 2 ++ programs/write/Fr.rc | 5 +++-- programs/write/Ja.rc | 4 ++-- programs/write/Ko.rc | 2 ++ programs/write/Lt.rc | 4 ++-- programs/write/Makefile.in | 16 +++++++++++++++- programs/write/Nl.rc | 2 ++ programs/write/No.rc | 2 ++ programs/write/Pl.rc | 2 ++ programs/write/Pt.rc | 2 ++ programs/write/Ro.rc | 4 ++-- programs/write/Ru.rc | 2 ++ programs/write/Si.rc | 4 ++-- programs/write/Sv.rc | 2 ++ programs/write/resources.h | 2 ++ programs/write/rsrc.rc | 38 -------------------------------------- 17 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/programs/write/De.rc b/programs/write/De.rc index c2afa08..a953576 100644 --- a/programs/write/De.rc +++ b/programs/write/De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE diff --git a/programs/write/En.rc b/programs/write/En.rc index 5215db5..7159578 100644 --- a/programs/write/En.rc +++ b/programs/write/En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE diff --git a/programs/write/Fr.rc b/programs/write/Fr.rc index 0258efc..a81dffd 100644 --- a/programs/write/Fr.rc +++ b/programs/write/Fr.rc @@ -17,6 +17,9 @@ * 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 "resources.h" + #pragma code_page(65001)
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -25,5 +28,3 @@ STRINGTABLE { IDS_FAILED, "Wordpad n'a pas pu être démarré" } - -#pragma code_page(default) diff --git a/programs/write/Ja.rc b/programs/write/Ja.rc index 237a53d..5c9a825 100644 --- a/programs/write/Ja.rc +++ b/programs/write/Ja.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -27,5 +29,3 @@ STRINGTABLE { IDS_FAILED, "Wordpad の起動に失敗しました" } - -#pragma code_page(default) diff --git a/programs/write/Ko.rc b/programs/write/Ko.rc index f78ea13..3e076c2 100644 --- a/programs/write/Ko.rc +++ b/programs/write/Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE diff --git a/programs/write/Lt.rc b/programs/write/Lt.rc index 63182f9..5cef934 100644 --- a/programs/write/Lt.rc +++ b/programs/write/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -27,5 +29,3 @@ STRINGTABLE { IDS_FAILED, "Nepavyko paleisti Wordpad" } - -#pragma code_page(default) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index eb9e0ca..be459b6 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -9,7 +9,21 @@ IMPORTS = user32 gdi32 kernel32
C_SRCS = write.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc
@MAKE_PROG_RULES@
diff --git a/programs/write/Nl.rc b/programs/write/Nl.rc index 5f1611e..6910cde 100644 --- a/programs/write/Nl.rc +++ b/programs/write/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE diff --git a/programs/write/No.rc b/programs/write/No.rc index 9b5a4bd..b20abc3 100644 --- a/programs/write/No.rc +++ b/programs/write/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE diff --git a/programs/write/Pl.rc b/programs/write/Pl.rc index fc06b89..6a3c8ae 100644 --- a/programs/write/Pl.rc +++ b/programs/write/Pl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE diff --git a/programs/write/Pt.rc b/programs/write/Pt.rc index e2ba2eb..95fad34 100644 --- a/programs/write/Pt.rc +++ b/programs/write/Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE diff --git a/programs/write/Ro.rc b/programs/write/Ro.rc index 8a33118..f6a7b65 100644 --- a/programs/write/Ro.rc +++ b/programs/write/Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) @@ -25,5 +27,3 @@ STRINGTABLE { IDS_FAILED, "Execuția Wordpad a eșuat" } - -#pragma code_page(default) diff --git a/programs/write/Ru.rc b/programs/write/Ru.rc index 653d426..5824ad1 100644 --- a/programs/write/Ru.rc +++ b/programs/write/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 diff --git a/programs/write/Si.rc b/programs/write/Si.rc index d7e2226..9d3e5fe 100644 --- a/programs/write/Si.rc +++ b/programs/write/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
#pragma code_page(65001) @@ -26,5 +28,3 @@ STRINGTABLE { IDS_FAILED, "Zagon programa Wordpad ni uspel" } - -#pragma code_page(default) diff --git a/programs/write/Sv.rc b/programs/write/Sv.rc index dea6521..7cfa2ac 100644 --- a/programs/write/Sv.rc +++ b/programs/write/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE diff --git a/programs/write/resources.h b/programs/write/resources.h index e99e5b1..73ef91a 100644 --- a/programs/write/resources.h +++ b/programs/write/resources.h @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> + #define IDS_FAILED 101 diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc deleted file mode 100644 index be1359d..0000000 --- a/programs/write/rsrc.rc +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2007 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 "resources.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "De.rc" -#include "En.rc" -#include "Fr.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"