Michael Stefaniuc : winefile: Build language resource files separately.
Alexandre Julliard
julliard at winehq.org
Fri Jul 3 09:31:07 CDT 2009
Module: wine
Branch: master
Commit: 08ac4a4c222ff1e115c8745b85c4df33f0ee1ce7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ac4a4c222ff1e115c8745b85c4df33f0ee1ce7
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jul 3 01:37:52 2009 +0200
winefile: Build language resource files separately.
Do not include them from an other rc file.
---
programs/winefile/Cs.rc | 2 ++
programs/winefile/Da.rc | 2 ++
programs/winefile/De.rc | 2 ++
programs/winefile/En.rc | 2 ++
programs/winefile/Es.rc | 2 ++
programs/winefile/Fr.rc | 2 ++
programs/winefile/Hu.rc | 2 ++
programs/winefile/It.rc | 2 ++
programs/winefile/Ja.rc | 4 ++--
programs/winefile/Ko.rc | 2 ++
programs/winefile/Lt.rc | 4 ++--
programs/winefile/Makefile.in | 23 ++++++++++++++++++++++-
programs/winefile/Nl.rc | 2 ++
programs/winefile/No.rc | 2 ++
programs/winefile/Pl.rc | 2 ++
programs/winefile/Pt.rc | 1 +
programs/winefile/Ru.rc | 2 ++
programs/winefile/Si.rc | 4 ++--
programs/winefile/Sv.rc | 2 ++
programs/winefile/Tr.rc | 2 ++
programs/winefile/Zh.rc | 4 ++--
programs/winefile/resource.h | 2 ++
programs/winefile/rsrc.rc | 26 --------------------------
23 files changed, 63 insertions(+), 35 deletions(-)
diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc
index 6d2294a..ad71863 100644
--- a/programs/winefile/Cs.rc
+++ b/programs/winefile/Cs.rc
@@ -23,6 +23,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/winefile/Da.rc b/programs/winefile/Da.rc
index babc0da..ffc7415 100644
--- a/programs/winefile/Da.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/De.rc b/programs/winefile/De.rc
index ae1a80f..e0718be 100644
--- a/programs/winefile/De.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc
index dc0ef28..644cf2f 100644
--- a/programs/winefile/En.rc
+++ b/programs/winefile/En.rc
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
/* Menu */
diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc
index fa82f4f..7e445ee 100644
--- a/programs/winefile/Es.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc
index 73d7c8e..25e7874 100644
--- a/programs/winefile/Fr.rc
+++ b/programs/winefile/Fr.rc
@@ -23,6 +23,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
/* Menu */
diff --git a/programs/winefile/Hu.rc b/programs/winefile/Hu.rc
index f73f376..f7ca49a 100644
--- a/programs/winefile/Hu.rc
+++ b/programs/winefile/Hu.rc
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
/* Menu */
diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc
index 832d422..bfbf6f1 100644
--- a/programs/winefile/It.rc
+++ b/programs/winefile/It.rc
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
/* Menu */
diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc
index cd68b65..b73486a 100644
--- a/programs/winefile/Ja.rc
+++ b/programs/winefile/Ja.rc
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -261,5 +263,3 @@ STRINGTABLE
IDS_FREE_SPACE_FMT "%s of %s free"
}
-
-#pragma code_page(default)
diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc
index 02821d0..0a6207a 100644
--- a/programs/winefile/Ko.rc
+++ b/programs/winefile/Ko.rc
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
/* Menu */
diff --git a/programs/winefile/Lt.rc b/programs/winefile/Lt.rc
index 04445e7..32cec0e 100644
--- a/programs/winefile/Lt.rc
+++ b/programs/winefile/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)
@@ -259,5 +261,3 @@ STRINGTABLE
IDS_FREE_SPACE_FMT "%s iš %s laisva"
}
-
-#pragma code_page(default)
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index 804e349..bd808b5 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -11,7 +11,28 @@ C_SRCS = \
splitpath.c \
winefile.c
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+ Cs.rc \
+ Da.rc \
+ De.rc \
+ En.rc \
+ Es.rc \
+ Fr.rc \
+ Hu.rc \
+ It.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 \
+ rsrc.rc
SVG_SRCS = winefile.svg
diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc
index 06eef8e..8f6f7f1 100644
--- a/programs/winefile/Nl.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/No.rc b/programs/winefile/No.rc
index 04f8509..eec8b82 100644
--- a/programs/winefile/No.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc
index 3131617..50247e3 100644
--- a/programs/winefile/Pl.rc
+++ b/programs/winefile/Pl.rc
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
/* Menu */
diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc
index d23038d..176a5d7 100644
--- a/programs/winefile/Pt.rc
+++ b/programs/winefile/Pt.rc
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
/* Menu */
diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc
index dd07152..ef8c657 100644
--- a/programs/winefile/Ru.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/Si.rc b/programs/winefile/Si.rc
index 5aa006d..2010f59 100644
--- a/programs/winefile/Si.rc
+++ b/programs/winefile/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
@@ -258,5 +260,3 @@ STRINGTABLE
IDS_FREE_SPACE_FMT "Prosto: %s od %s"
}
-
-#pragma code_page(default)
diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc
index 6905c5e..4deddd9 100644
--- a/programs/winefile/Sv.rc
+++ b/programs/winefile/Sv.rc
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
/* Menu */
diff --git a/programs/winefile/Tr.rc b/programs/winefile/Tr.rc
index 3a75a7e..8735264 100644
--- a/programs/winefile/Tr.rc
+++ b/programs/winefile/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
/* Menu */
diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc
index aba7221..8eb3300 100644
--- a/programs/winefile/Zh.rc
+++ b/programs/winefile/Zh.rc
@@ -20,6 +20,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)
@@ -298,5 +300,3 @@ FONT 9, "MS Shell Dlg"
PUSHBUTTON "取消", 2, 158, 23, 47, 14
PUSHBUTTON "幫助(&H)", 254, 158, 43, 47, 14
}
-
-#pragma code_page(default)
diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h
index 1e843e5..7c14871 100644
--- a/programs/winefile/resource.h
+++ b/programs/winefile/resource.h
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <windef.h>
+#include <winuser.h>
/* images */
diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc
index 4a65aac..c921271 100644
--- a/programs/winefile/rsrc.rc
+++ b/programs/winefile/rsrc.rc
@@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <windef.h>
-#include <winuser.h>
-
#include "resource.h"
/* define language neutral resources */
@@ -52,26 +49,3 @@ IDB_DRIVEBAR BITMAP DISCARDABLE drivebar.bmp
/* @makedep: images.bmp */
IDB_IMAGES BITMAP DISCARDABLE images.bmp
-
-/* include localised resources */
-
-#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 "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"
More information about the wine-cvs
mailing list