Michael Stefaniuc : cmd: Build language resource files separately.
Alexandre Julliard
julliard at winehq.org
Thu Jul 2 08:25:05 CDT 2009
Module: wine
Branch: master
Commit: 2753331af06efe7c118bc0db51d9e34e15ef9f9d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2753331af06efe7c118bc0db51d9e34e15ef9f9d
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Jul 2 00:28:36 2009 +0200
cmd: Build language resource files separately.
Do not include them from an other rc file.
---
programs/cmd/Cs.rc | 2 ++
programs/cmd/Da.rc | 2 ++
programs/cmd/De.rc | 2 ++
programs/cmd/En.rc | 2 ++
programs/cmd/Es.rc | 2 ++
programs/cmd/Fr.rc | 2 ++
programs/cmd/Ja.rc | 4 ++--
programs/cmd/Ko.rc | 2 ++
programs/cmd/Makefile.in | 18 +++++++++++++++++-
programs/cmd/Nl.rc | 2 ++
programs/cmd/No.rc | 2 ++
programs/cmd/Pl.rc | 2 ++
programs/cmd/Pt.rc | 2 ++
programs/cmd/Ru.rc | 2 ++
programs/cmd/Si.rc | 4 ++--
programs/cmd/Tr.rc | 2 ++
programs/cmd/wcmd.h | 1 +
programs/cmd/wcmdrc.rc | 21 ---------------------
18 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc
index 15ece45..7c63445 100644
--- a/programs/cmd/Cs.rc
+++ b/programs/cmd/Cs.rc
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/programs/cmd/Da.rc b/programs/cmd/Da.rc
index 9870f71..4bbe688 100644
--- a/programs/cmd/Da.rc
+++ b/programs/cmd/Da.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc
index ab41d33..e0ad4ee 100644
--- a/programs/cmd/De.rc
+++ b/programs/cmd/De.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc
index 941d58f..0c31dfb 100644
--- a/programs/cmd/En.rc
+++ b/programs/cmd/En.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc
index f27906a..1253b27 100644
--- a/programs/cmd/Es.rc
+++ b/programs/cmd/Es.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc
index 7551c76..8092bdb 100644
--- a/programs/cmd/Fr.rc
+++ b/programs/cmd/Fr.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc
index 20273ec..7f8a95c 100644
--- a/programs/cmd/Ja.rc
+++ b/programs/cmd/Ja.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -279,5 +281,3 @@ EXIT\t\tCMDを終了\n\n\
WCMD_MOREPROMPT, "More? "
WCMD_LINETOOLONG, "The input line is too long.\n"
}
-
-#pragma code_page(default)
diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc
index e2831f5..114fb3b 100644
--- a/programs/cmd/Ko.rc
+++ b/programs/cmd/Ko.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in
index 7767dcd..07dc1ff 100644
--- a/programs/cmd/Makefile.in
+++ b/programs/cmd/Makefile.in
@@ -13,7 +13,23 @@ C_SRCS = \
directory.c \
wcmdmain.c
-RC_SRCS = wcmdrc.rc
+RC_SRCS = \
+ Cs.rc \
+ Da.rc \
+ De.rc \
+ En.rc \
+ Es.rc \
+ Fr.rc \
+ Ja.rc \
+ Ko.rc \
+ Nl.rc \
+ No.rc \
+ Pl.rc \
+ Pt.rc \
+ Ru.rc \
+ Si.rc \
+ Tr.rc \
+ wcmdrc.rc
SVG_SRCS = wcmd.svg
diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc
index 6863b00..2e8bf1c 100644
--- a/programs/cmd/Nl.rc
+++ b/programs/cmd/Nl.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc
index 71a694b..89f020a 100644
--- a/programs/cmd/No.rc
+++ b/programs/cmd/No.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc
index 74e852e..5696dc0 100644
--- a/programs/cmd/Pl.rc
+++ b/programs/cmd/Pl.rc
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc
index 65e0a6b..be6ce52 100644
--- a/programs/cmd/Pt.rc
+++ b/programs/cmd/Pt.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
STRINGTABLE
diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc
index 5bd2a05..3e0b949 100644
--- a/programs/cmd/Ru.rc
+++ b/programs/cmd/Ru.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc
index 9a18741..d58aab0 100644
--- a/programs/cmd/Si.rc
+++ b/programs/cmd/Si.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -272,5 +274,3 @@ Uporabite HELP <ukaz> za več informacijo o kateremkoli od zgoraj navedenih ukaz
WCMD_MOREPROMPT, "Več? "
WCMD_LINETOOLONG, "The input line is too long.\n"
}
-
-#pragma code_page(default)
diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc
index 656a583..36fbf70 100644
--- a/programs/cmd/Tr.rc
+++ b/programs/cmd/Tr.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "wcmd.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index 4d3bab6..667b3b9 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -21,6 +21,7 @@
#define IDI_ICON1 1
#include <windows.h>
+#include <windef.h>
#ifndef RC_INVOKED
#include <string.h>
#include <stdlib.h>
diff --git a/programs/cmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc
index d6906d3..1eec839 100644
--- a/programs/cmd/wcmdrc.rc
+++ b/programs/cmd/wcmdrc.rc
@@ -16,28 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <windef.h>
-#include <winuser.h>
-
#include "wcmd.h"
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.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 "Tr.rc"
-
-LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL
-
/* @makedep: wcmd.ico */
IDI_ICON1 ICON wcmd.ico
More information about the wine-cvs
mailing list