Michael Stefaniuc : view: Build language resource files separately.

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


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

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

view: Build language resource files separately.

Do not include them from an other rc file.

---

 programs/view/Cs.rc       |    2 +
 programs/view/Da.rc       |    2 +
 programs/view/De.rc       |    2 +
 programs/view/En.rc       |    2 +
 programs/view/Eo.rc       |    2 +
 programs/view/Es.rc       |    2 +
 programs/view/Fr.rc       |    2 +
 programs/view/It.rc       |    2 +
 programs/view/Ja.rc       |    4 +-
 programs/view/Ko.rc       |    2 +
 programs/view/Lt.rc       |    4 +-
 programs/view/Makefile.in |   23 ++++++++++++++++++++-
 programs/view/Nl.rc       |    2 +
 programs/view/No.rc       |    2 +
 programs/view/Pl.rc       |    2 +
 programs/view/Pt.rc       |    2 +
 programs/view/Ro.rc       |    4 +-
 programs/view/Ru.rc       |    2 +
 programs/view/Si.rc       |    4 +-
 programs/view/Sv.rc       |    2 +
 programs/view/Tr.rc       |    2 +
 programs/view/Zh.rc       |    4 +-
 programs/view/resource.h  |    2 +
 programs/view/viewrc.rc   |   49 ---------------------------------------------
 24 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc
index ca34121..58ee9ca 100644
--- a/programs/view/Cs.rc
+++ b/programs/view/Cs.rc
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/programs/view/Da.rc b/programs/view/Da.rc
index 91fd214..8996cf8 100644
--- a/programs/view/Da.rc
+++ b/programs/view/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/view/De.rc b/programs/view/De.rc
index 5e7cf31..b77fc82 100644
--- a/programs/view/De.rc
+++ b/programs/view/De.rc
@@ -19,6 +19,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/view/En.rc b/programs/view/En.rc
index 042f303..b201290 100644
--- a/programs/view/En.rc
+++ b/programs/view/En.rc
@@ -20,6 +20,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/view/Eo.rc b/programs/view/Eo.rc
index bcdeba7..bc61a8d 100644
--- a/programs/view/Eo.rc
+++ b/programs/view/Eo.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 /*
diff --git a/programs/view/Es.rc b/programs/view/Es.rc
index f1b897d..e0f53f3 100644
--- a/programs/view/Es.rc
+++ b/programs/view/Es.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc
index b2ab0a4..786a63d 100644
--- a/programs/view/Fr.rc
+++ b/programs/view/Fr.rc
@@ -21,6 +21,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/view/It.rc b/programs/view/It.rc
index 37747ce..0839c44 100644
--- a/programs/view/It.rc
+++ b/programs/view/It.rc
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 /*
diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc
index 46c8e11..0b69216 100644
--- a/programs/view/Ja.rc
+++ b/programs/view/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)
 
@@ -72,5 +74,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION         "標準メタファイル ビュアー"
 END
-
-#pragma code_page(default)
diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc
index 5df207b..3451626 100644
--- a/programs/view/Ko.rc
+++ b/programs/view/Ko.rc
@@ -21,6 +21,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/view/Lt.rc b/programs/view/Lt.rc
index cbce3bb..fdcf731 100644
--- a/programs/view/Lt.rc
+++ b/programs/view/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)
 
@@ -71,5 +73,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION         "Įprastinė metafailų žiūryklė"
 END
-
-#pragma code_page(default)
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 134a2b4..ff34532 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -11,7 +11,28 @@ C_SRCS = \
 	view.c \
 	winmain.c
 
-RC_SRCS = viewrc.rc
+RC_SRCS = \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Eo.rc \
+	Es.rc \
+	Fr.rc \
+	It.rc \
+	Ja.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ro.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc
index 34a9d4f..623506b 100644
--- a/programs/view/Nl.rc
+++ b/programs/view/Nl.rc
@@ -18,6 +18,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/view/No.rc b/programs/view/No.rc
index e728966..4a18853 100644
--- a/programs/view/No.rc
+++ b/programs/view/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/view/Pl.rc b/programs/view/Pl.rc
index 3f3e937..28828d8 100644
--- a/programs/view/Pl.rc
+++ b/programs/view/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/view/Pt.rc b/programs/view/Pt.rc
index 47aab01..3003080 100644
--- a/programs/view/Pt.rc
+++ b/programs/view/Pt.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /*
  *
  * Menu
diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc
index b03fe31..8c05f06 100644
--- a/programs/view/Ro.rc
+++ b/programs/view/Ro.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -69,5 +71,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION         "Vizualizator de fișiere metafile normale"
 END
-
-#pragma code_page(default)
diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc
index cbdc28e..9d4d39e 100644
--- a/programs/view/Ru.rc
+++ b/programs/view/Ru.rc
@@ -18,6 +18,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/view/Si.rc b/programs/view/Si.rc
index 8cb4988..8e6a0f2 100644
--- a/programs/view/Si.rc
+++ b/programs/view/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
@@ -70,5 +72,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION         "Program za ogled Metafile slik"
 END
-
-#pragma code_page(default)
diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc
index b1bb50d..2f7eea3 100644
--- a/programs/view/Sv.rc
+++ b/programs/view/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/view/Tr.rc b/programs/view/Tr.rc
index 38ed849..3e6ea6f 100644
--- a/programs/view/Tr.rc
+++ b/programs/view/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/view/Zh.rc b/programs/view/Zh.rc
index 84bd638..05067f8 100644
--- a/programs/view/Zh.rc
+++ b/programs/view/Zh.rc
@@ -18,6 +18,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)
 
@@ -120,5 +122,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION         "普通 Metafile 閱讀器"
 END
-
-#pragma code_page(default)
diff --git a/programs/view/resource.h b/programs/view/resource.h
index 619da49..7932687 100644
--- a/programs/view/resource.h
+++ b/programs/view/resource.h
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 #define IDS_DESCRIPTION                 2
 #define IDI_APPICON                     101
 #define IDM_EXIT                        1000
diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc
deleted file mode 100644
index 6217cf6..0000000
--- a/programs/view/viewrc.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 1998 Douglas Ridgway
- *
- * 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 "resource.h"
-
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Eo.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "It.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"
-#include "Tr.rc"
-#include "Zh.rc"
-
-/*
- * Icon
- */
-
-/*IDI_APPICON             ICON    DISCARDABLE     "view.ico"*/




More information about the wine-cvs mailing list