Module: wine Branch: master Commit: b4b74945848aff46ef9903f518aab625da4260e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b74945848aff46ef9903f518...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jul 3 01:36:09 2009 +0200
progman: Build language resource files separately.
Do not include them from an other rc file.
---
programs/progman/Cs.rc | 2 + programs/progman/Da.rc | 2 + programs/progman/De.rc | 2 + programs/progman/En.rc | 2 + programs/progman/Es.rc | 2 + programs/progman/Fr.rc | 2 + programs/progman/Hu.rc | 2 + programs/progman/It.rc | 2 + programs/progman/Ko.rc | 2 + programs/progman/Lt.rc | 4 +- programs/progman/Makefile.in | 22 ++++++++++++++++++++- programs/progman/Nl.rc | 2 + programs/progman/No.rc | 2 + programs/progman/Pl.rc | 2 + programs/progman/Pt.rc | 2 + programs/progman/Ru.rc | 2 + programs/progman/Si.rc | 4 +- programs/progman/Sv.rc | 2 + programs/progman/Tr.rc | 2 + programs/progman/Zh.rc | 4 +- programs/progman/accel.rc | 3 ++ programs/progman/progman.h | 3 +- programs/progman/rsrc.rc | 43 ------------------------------------------ 23 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/programs/progman/Cs.rc b/programs/progman/Cs.rc index 07838b0..06139b9 100644 --- a/programs/progman/Cs.rc +++ b/programs/progman/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Czech strings in CP1250 */
/* Menu */ diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc index b99c5f5..7e1438d 100644 --- a/programs/progman/Da.rc +++ b/programs/progman/Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
/* Menu */ diff --git a/programs/progman/De.rc b/programs/progman/De.rc index c94328c..b72118f 100644 --- a/programs/progman/De.rc +++ b/programs/progman/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/progman/En.rc b/programs/progman/En.rc index 201deca..bd6aaaa 100644 --- a/programs/progman/En.rc +++ b/programs/progman/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc index 391a5e5..2888354 100644 --- a/programs/progman/Es.rc +++ b/programs/progman/Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
/* Menu */ diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc index 39b3461..80ff466 100644 --- a/programs/progman/Fr.rc +++ b/programs/progman/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
/* Menu */ diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc index 678d68d..9d53fb3 100644 --- a/programs/progman/Hu.rc +++ b/programs/progman/Hu.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 0c280f5..9e3437d 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index 6c749f2..5c2cdd1 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/progman/Lt.rc b/programs/progman/Lt.rc index ac55054..d484c55 100644 --- a/programs/progman/Lt.rc +++ b/programs/progman/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
/* UTF-8 */ @@ -240,5 +242,3 @@ GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ bendrojoje viešojoje licencijoje." } - -#pragma code_page(default) diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 9ed7859..921f9a8 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -14,7 +14,27 @@ C_SRCS = \ program.c \ string.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + accel.rc
@MAKE_PROG_RULES@
diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index 7b8c8d0..b2ca361 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/progman/No.rc b/programs/progman/No.rc index 1af4170..618e985 100644 --- a/programs/progman/No.rc +++ b/programs/progman/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/progman/Pl.rc b/programs/progman/Pl.rc index 626618c..351930c 100644 --- a/programs/progman/Pl.rc +++ b/programs/progman/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc index 227b767..98e4b86 100644 --- a/programs/progman/Pt.rc +++ b/programs/progman/Pt.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
/* Menu */ diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc index 90d6302..7d6121b 100644 --- a/programs/progman/Ru.rc +++ b/programs/progman/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/progman/Si.rc b/programs/progman/Si.rc index 1d394fd..1744705 100644 --- a/programs/progman/Si.rc +++ b/programs/progman/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + #pragma code_page(65001)
/* Menu */ @@ -244,5 +246,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/progman/Sv.rc b/programs/progman/Sv.rc index be43497..0d23948 100644 --- a/programs/progman/Sv.rc +++ b/programs/progman/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/progman/Tr.rc b/programs/progman/Tr.rc index a296331..6407acd 100644 --- a/programs/progman/Tr.rc +++ b/programs/progman/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Menu */
MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/progman/Zh.rc b/programs/progman/Zh.rc index d42a3f2..d78ac76 100644 --- a/programs/progman/Zh.rc +++ b/programs/progman/Zh.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "progman.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -410,5 +412,3 @@ IDS_LIBRARIES_DLL, "動態連接庫 (*.dll)" IDS_SYMBOL_FILES, "圖標檔案" IDS_SYMBOLS_ICO, "圖標 (*.ico)" } - -#pragma code_page(default) diff --git a/programs/progman/accel.rc b/programs/progman/accel.rc index c86c0f3..44edae5 100644 --- a/programs/progman/accel.rc +++ b/programs/progman/accel.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <winuser.h> +#include "progman.h" + ACCEL ACCELERATORS { VK_RETURN, PM_EXECUTE, VIRTKEY, ALT diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 5f7504b..aa22c6d 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -26,7 +26,8 @@ #define MAX_PATHNAME_LEN 1024 #define MAX_LANGUAGE_NUMBER (PM_LAST_LANGUAGE - PM_FIRST_LANGUAGE)
-#include "windows.h" +#include <windows.h> +#include <windef.h>
/* Fallback icon */ #define DEFAULTICON OIC_WINLOGO diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc deleted file mode 100644 index 167c201..0000000 --- a/programs/progman/rsrc.rc +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1996 Ulrich Schmid - * - * 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 <winuser.h> - -#include "progman.h" -#include "accel.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.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 "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"