progman: Build language resource files separately.

Do not include them from an other rc file.
2009-07-03 01:36:09 +02:00 · 2009-07-03 01:36:09 +02:00 · b4b7494584
parent 0b16b40148
commit b4b7494584
23 changed files with 64 additions and 51 deletions
--- 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 */
--- 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 */
--- 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
--- 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
--- 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 */
--- 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 */
--- 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
--- 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
--- 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
--- 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)
--- 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@

--- 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
--- 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
--- 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

--- 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 */
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- a/programs/progman/rsrc.rc
+++ b/programs/progman/rsrc.rc
@ -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"