regedit: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:30:06 CDT 2009
Do not include them from an other rc file.
---
programs/regedit/Bg.rc | 1 +
programs/regedit/Cs.rc | 2 ++
programs/regedit/Da.rc | 4 +++-
programs/regedit/De.rc | 4 ++--
programs/regedit/En.rc | 2 ++
programs/regedit/Es.rc | 2 ++
programs/regedit/Fr.rc | 2 ++
programs/regedit/Hu.rc | 2 ++
programs/regedit/It.rc | 2 ++
programs/regedit/Ja.rc | 4 ++--
programs/regedit/Ko.rc | 2 ++
programs/regedit/Lt.rc | 4 ++--
programs/regedit/Makefile.in | 24 +++++++++++++++++++++++-
programs/regedit/Nl.rc | 2 ++
programs/regedit/No.rc | 2 ++
programs/regedit/Pl.rc | 2 ++
programs/regedit/Pt.rc | 2 ++
programs/regedit/Ru.rc | 2 ++
programs/regedit/Si.rc | 4 ++--
programs/regedit/Sv.rc | 2 ++
programs/regedit/Tr.rc | 2 ++
programs/regedit/Zh.rc | 4 ++--
programs/regedit/resource.h | 3 +++
programs/regedit/rsrc.rc | 27 ---------------------------
24 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc
index 0ac8e57..3ff32ac 100644
--- a/programs/regedit/Bg.rc
+++ b/programs/regedit/Bg.rc
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
diff --git a/programs/regedit/Cs.rc b/programs/regedit/Cs.rc
index acfb497..f8741bf 100644
--- a/programs/regedit/Cs.rc
+++ b/programs/regedit/Cs.rc
@@ -20,6 +20,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/regedit/Da.rc b/programs/regedit/Da.rc
index fd499d0..d49727d 100644
--- a/programs/regedit/Da.rc
+++ b/programs/regedit/Da.rc
@@ -18,7 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
- LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+#include "resource.h"
+
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
/*
* Menu
diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc
index b84a1e1..84ed865 100644
--- a/programs/regedit/De.rc
+++ b/programs/regedit/De.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -336,5 +338,3 @@ BEGIN
END
/*****************************************************************/
-
-#pragma code_page(default)
diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc
index b5d6f6d..3c152a4 100644
--- a/programs/regedit/En.rc
+++ b/programs/regedit/En.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* English Neutral Resources */
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc
index bfcd879..c6d3f95 100644
--- a/programs/regedit/Es.rc
+++ b/programs/regedit/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/regedit/Fr.rc b/programs/regedit/Fr.rc
index 9e197cf..d24d192 100644
--- a/programs/regedit/Fr.rc
+++ b/programs/regedit/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/regedit/Hu.rc b/programs/regedit/Hu.rc
index 6f2349e..fb893e1 100644
--- a/programs/regedit/Hu.rc
+++ b/programs/regedit/Hu.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* Hungarian Resources */
LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc
index 57588ab..e06aa67 100644
--- a/programs/regedit/It.rc
+++ b/programs/regedit/It.rc
@@ -20,6 +20,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/regedit/Ja.rc b/programs/regedit/Ja.rc
index c52567f..4175acd 100644
--- a/programs/regedit/Ja.rc
+++ b/programs/regedit/Ja.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -329,5 +331,3 @@ BEGIN
END
/*****************************************************************/
-
-#pragma code_page(default)
diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc
index 17905d7..c9bbfa1 100644
--- a/programs/regedit/Ko.rc
+++ b/programs/regedit/Ko.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* Korean resources */
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/programs/regedit/Lt.rc b/programs/regedit/Lt.rc
index 83ff5bb..21109fa 100644
--- a/programs/regedit/Lt.rc
+++ b/programs/regedit/Lt.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -327,5 +329,3 @@ END
BEGIN
"resource.h\0"
END
-
-#pragma code_page(default)
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 9f872dc..b0fba49 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -22,7 +22,29 @@ C_SRCS = \
regproc.c \
treeview.c
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+ Bg.rc \
+ 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 = regedit.svg
diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc
index 43154ed..f02ab65 100644
--- a/programs/regedit/Nl.rc
+++ b/programs/regedit/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/regedit/No.rc b/programs/regedit/No.rc
index 6661178..7421a03 100644
--- a/programs/regedit/No.rc
+++ b/programs/regedit/No.rc
@@ -18,6 +18,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/regedit/Pl.rc b/programs/regedit/Pl.rc
index a77660c..a414438 100644
--- a/programs/regedit/Pl.rc
+++ b/programs/regedit/Pl.rc
@@ -18,6 +18,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/regedit/Pt.rc b/programs/regedit/Pt.rc
index 5dd2438..ae38395 100644
--- a/programs/regedit/Pt.rc
+++ b/programs/regedit/Pt.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
/*
* Menu
*/
diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc
index a80a62a..257b925 100644
--- a/programs/regedit/Ru.rc
+++ b/programs/regedit/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/regedit/Si.rc b/programs/regedit/Si.rc
index ce04db1..8c2c1aa 100644
--- a/programs/regedit/Si.rc
+++ b/programs/regedit/Si.rc
@@ -18,6 +18,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
@@ -329,5 +331,3 @@ BEGIN
END
/*****************************************************************/
-
-#pragma code_page(default)
diff --git a/programs/regedit/Sv.rc b/programs/regedit/Sv.rc
index dd384d9..3827739 100644
--- a/programs/regedit/Sv.rc
+++ b/programs/regedit/Sv.rc
@@ -18,6 +18,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/regedit/Tr.rc b/programs/regedit/Tr.rc
index 2f1bc04..3065628 100644
--- a/programs/regedit/Tr.rc
+++ b/programs/regedit/Tr.rc
@@ -18,6 +18,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/regedit/Zh.rc b/programs/regedit/Zh.rc
index 931be0e..87561bd 100644
--- a/programs/regedit/Zh.rc
+++ b/programs/regedit/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)
@@ -638,5 +640,3 @@ BEGIN
END
/*****************************************************************/
-
-#pragma code_page(default)
diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h
index c3b8456..d167251 100644
--- a/programs/regedit/resource.h
+++ b/programs/regedit/resource.h
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <windef.h>
+#include <winuser.h>
+
#define ID_REGISTRY_MENU 0
#define ID_EDIT_MENU 1
#define ID_VIEW_MENU 2
diff --git a/programs/regedit/rsrc.rc b/programs/regedit/rsrc.rc
index 6627a64..71f4080 100644
--- a/programs/regedit/rsrc.rc
+++ b/programs/regedit/rsrc.rc
@@ -18,9 +18,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 */
@@ -67,27 +64,3 @@ IDI_REGEDIT ICON DISCARDABLE regedit.ico
#define WINE_PRODUCTVERSION_STR "5.2"
#include "wine/wine_common_ver.rc"
-
-/* include localised resources */
-
-#include "Bg.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 "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"
--
1.6.3.3
More information about the wine-patches
mailing list