Michael Stefaniuc : taskmgr: Build language resource files separately.

Alexandre Julliard julliard at winehq.org
Thu Jul 2 08:25:06 CDT 2009 

Module: wine
Branch: master
Commit: c02f249888f4eb3743d416302ac5fdac00ba02cb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c02f249888f4eb3743d416302ac5fdac00ba02cb

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jul  2 00:30:20 2009 +0200

taskmgr: Build language resource files separately.

Do not include them from an other rc file.

---

 programs/taskmgr/Da.rc       |    2 ++
 programs/taskmgr/De.rc       |    2 ++
 programs/taskmgr/En.rc       |    2 ++
 programs/taskmgr/Fr.rc       |    2 ++
 programs/taskmgr/Ja.rc       |    4 ++--
 programs/taskmgr/Ko.rc       |    2 ++
 programs/taskmgr/Lt.rc       |    4 ++--
 programs/taskmgr/Makefile.in |   19 ++++++++++++++++++-
 programs/taskmgr/Nl.rc       |    2 ++
 programs/taskmgr/No.rc       |    2 ++
 programs/taskmgr/Pl.rc       |    2 ++
 programs/taskmgr/Pt.rc       |    2 ++
 programs/taskmgr/Ru.rc       |    2 ++
 programs/taskmgr/Si.rc       |    4 ++--
 programs/taskmgr/Sv.rc       |    2 ++
 programs/taskmgr/Tr.rc       |    2 ++
 programs/taskmgr/Zh.rc       |    4 ++--
 programs/taskmgr/resource.h  |    5 +++++
 programs/taskmgr/taskmgr.rc  |   23 -----------------------
 19 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc
index fb9bab0..fa59e93 100644
--- a/programs/taskmgr/Da.rc
+++ b/programs/taskmgr/Da.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc
index 8b96bc2..e1d3b19 100644
--- a/programs/taskmgr/De.rc
+++ b/programs/taskmgr/De.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc
index ce2bdf5..45aa925 100644
--- a/programs/taskmgr/En.rc
+++ b/programs/taskmgr/En.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc
index 617a2bc..0c435cb 100644
--- a/programs/taskmgr/Fr.rc
+++ b/programs/taskmgr/Fr.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc
index e45d577..43334f2 100644
--- a/programs/taskmgr/Ja.rc
+++ b/programs/taskmgr/Ja.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -488,5 +490,3 @@ BEGIN
                             "プロセスの優先クラスを 通常以下 に設定します。"
     ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスの優先クラスを 低 に設定します。"
 END
-
-#pragma code_page(default)
diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc
index 390371b..45e0911 100644
--- a/programs/taskmgr/Ko.rc
+++ b/programs/taskmgr/Ko.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc
index c58647a..17cde26 100644
--- a/programs/taskmgr/Lt.rc
+++ b/programs/taskmgr/Lt.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -560,5 +562,3 @@ BEGIN
     IDS_DEBUG_CHANNEL_WARN             "Warn (įspėjimas)"
     IDS_DEBUG_CHANNEL_TRACE            "Trace (pėdsakas)"
 END
-
-#pragma code_page(default)
diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in
index 153a598..2f2b40a 100644
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@@ -29,7 +29,24 @@ C_SRCS = \
 	taskmgr.c \
 	trayicon.c
 
-RC_SRCS = taskmgr.rc
+RC_SRCS = \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Fr.rc \
+	Ja.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc \
+	taskmgr.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc
index 5d1860b..468769f 100644
--- a/programs/taskmgr/Nl.rc
+++ b/programs/taskmgr/Nl.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc
index f25eadc..19b6472 100644
--- a/programs/taskmgr/No.rc
+++ b/programs/taskmgr/No.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 /*
diff --git a/programs/taskmgr/Pl.rc b/programs/taskmgr/Pl.rc
index 1453709..9a38b49 100644
--- a/programs/taskmgr/Pl.rc
+++ b/programs/taskmgr/Pl.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc
index 42ece36..a7926e5 100644
--- a/programs/taskmgr/Pt.rc
+++ b/programs/taskmgr/Pt.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc
index e9d657b..d709513 100644
--- a/programs/taskmgr/Ru.rc
+++ b/programs/taskmgr/Ru.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc
index 670189b..4cfe73f 100644
--- a/programs/taskmgr/Si.rc
+++ b/programs/taskmgr/Si.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -486,5 +488,3 @@ BEGIN
                             "Dodeli proces v PODPOVPREČNI prioritetni razred"
     ID_PROCESS_PAGE_SETPRIORITY_LOW "Dodeli proces v NIZEK prioritetni razred"
 END
-
-#pragma code_page(default)
diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc
index 4e17787..a77eb61 100644
--- a/programs/taskmgr/Sv.rc
+++ b/programs/taskmgr/Sv.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc
index ac22a61..1149bb3 100644
--- a/programs/taskmgr/Tr.rc
+++ b/programs/taskmgr/Tr.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc
index cd7c061..969a404 100644
--- a/programs/taskmgr/Zh.rc
+++ b/programs/taskmgr/Zh.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -931,5 +933,3 @@ BEGIN
     ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "將進程設為中等以下優先級"
     ID_PROCESS_PAGE_SETPRIORITY_LOW          "將進程設為低優先級"
 END
-
-#pragma code_page(default)
diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h
index 1b98ab0..b735ef4 100644
--- a/programs/taskmgr/resource.h
+++ b/programs/taskmgr/resource.h
@@ -4,6 +4,11 @@
  * Used by taskmgr.rc
  *
  */
+
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
 #define IDS_APP_TITLE                   103
 #define IDC_TASKMGR                     109
 #define IDS_RUNDLG_CAPTION              110
diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc
index d027a1e..ad295f2 100644
--- a/programs/taskmgr/taskmgr.rc
+++ b/programs/taskmgr/taskmgr.rc
@@ -19,31 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
-
 #include "resource.h"
 
-/* Language resources */
-
-#include "Da.rc"
-#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 "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /*

More information about the wine-cvs mailing list