shell32: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:28:19 CDT 2009
Do not include them from an other rc file.
---
dlls/shell32/Makefile.in | 32 +++++++++++++++++++++++++++++-
dlls/shell32/shell32_Bg.rc | 2 +
dlls/shell32/shell32_Ca.rc | 2 +
dlls/shell32/shell32_Cs.rc | 2 +
dlls/shell32/shell32_Da.rc | 2 +
dlls/shell32/shell32_De.rc | 2 +
dlls/shell32/shell32_En.rc | 2 +
dlls/shell32/shell32_Eo.rc | 2 +
dlls/shell32/shell32_Es.rc | 2 +
dlls/shell32/shell32_Fi.rc | 2 +
dlls/shell32/shell32_Fr.rc | 4 +-
dlls/shell32/shell32_Hu.rc | 2 +
dlls/shell32/shell32_It.rc | 2 +
dlls/shell32/shell32_Ja.rc | 4 +-
dlls/shell32/shell32_Ko.rc | 2 +
dlls/shell32/shell32_Lt.rc | 4 +-
dlls/shell32/shell32_Nl.rc | 2 +
dlls/shell32/shell32_No.rc | 2 +
dlls/shell32/shell32_Pl.rc | 2 +
dlls/shell32/shell32_Pt.rc | 2 +
dlls/shell32/shell32_Ro.rc | 4 +-
dlls/shell32/shell32_Ru.rc | 2 +
dlls/shell32/shell32_Si.rc | 5 +--
dlls/shell32/shell32_Sk.rc | 2 +
dlls/shell32/shell32_Sv.rc | 2 +
dlls/shell32/shell32_Tr.rc | 2 +
dlls/shell32/shell32_Uk.rc | 2 +
dlls/shell32/shell32_Wa.rc | 2 +
dlls/shell32/shell32_Zh.rc | 4 +-
dlls/shell32/shres.rc | 46 --------------------------------------------
dlls/shell32/shresdef.h | 7 ++++++
31 files changed, 94 insertions(+), 60 deletions(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 6900d31..499cca6 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -54,7 +54,37 @@ C_SRCS = \
trash.c \
xdg.c
-RC_SRCS = shres.rc
+RC_SRCS = \
+ shell32_Bg.rc \
+ shell32_Ca.rc \
+ shell32_Cs.rc \
+ shell32_Da.rc \
+ shell32_De.rc \
+ shell32_En.rc \
+ shell32_Eo.rc \
+ shell32_Es.rc \
+ shell32_Fi.rc \
+ shell32_Fr.rc \
+ shell32_Hu.rc \
+ shell32_It.rc \
+ shell32_Ja.rc \
+ shell32_Ko.rc \
+ shell32_Lt.rc \
+ shell32_Nl.rc \
+ shell32_No.rc \
+ shell32_Pl.rc \
+ shell32_Pt.rc \
+ shell32_Ro.rc \
+ shell32_Ru.rc \
+ shell32_Si.rc \
+ shell32_Sk.rc \
+ shell32_Sv.rc \
+ shell32_Tr.rc \
+ shell32_Uk.rc \
+ shell32_Wa.rc \
+ shell32_Zh.rc \
+ shres.rc \
+ version.rc
SVG_SRCS = \
desktop.svg \
diff --git a/dlls/shell32/shell32_Bg.rc b/dlls/shell32/shell32_Bg.rc
index 8624231..f38168c 100644
--- a/dlls/shell32/shell32_Bg.rc
+++ b/dlls/shell32/shell32_Bg.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc
index 44e4e05..7a3a397 100644
--- a/dlls/shell32/shell32_Ca.rc
+++ b/dlls/shell32/shell32_Ca.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
/*
diff --git a/dlls/shell32/shell32_Cs.rc b/dlls/shell32/shell32_Cs.rc
index 90b32ae..2bd50d0 100644
--- a/dlls/shell32/shell32_Cs.rc
+++ b/dlls/shell32/shell32_Cs.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
diff --git a/dlls/shell32/shell32_Da.rc b/dlls/shell32/shell32_Da.rc
index 49e7b2b..232d387 100644
--- a/dlls/shell32/shell32_Da.rc
+++ b/dlls/shell32/shell32_Da.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc
index 051ca6b..c5b7d01 100644
--- a/dlls/shell32/shell32_De.rc
+++ b/dlls/shell32/shell32_De.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
index d7fa7c3..b4dddc2 100644
--- a/dlls/shell32/shell32_En.rc
+++ b/dlls/shell32/shell32_En.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc
index 40c503a..4d753df 100644
--- a/dlls/shell32/shell32_Eo.rc
+++ b/dlls/shell32/shell32_Eo.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
/* Cxapelitaj literoj estas en Latin-3 iso8895-3 */
diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc
index 17773fc..06580d1 100644
--- a/dlls/shell32/shell32_Es.rc
+++ b/dlls/shell32/shell32_Es.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc
index f0a1b5a..a124e64 100644
--- a/dlls/shell32/shell32_Fi.rc
+++ b/dlls/shell32/shell32_Fi.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc
index e1b95e6..511a373 100644
--- a/dlls/shell32/shell32_Fr.rc
+++ b/dlls/shell32/shell32_Fr.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
#pragma code_page(65001) /* UTF-8 */
@@ -309,5 +311,3 @@ GNU avec Wine ; si ce nâest pas le cas, écrivez à la : \
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \
MA 02110-1301, USA."
}
-
-#pragma code_page(default) /* Return to default encoding */
diff --git a/dlls/shell32/shell32_Hu.rc b/dlls/shell32/shell32_Hu.rc
index 9b1c198..466e826 100644
--- a/dlls/shell32/shell32_Hu.rc
+++ b/dlls/shell32/shell32_Hu.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
/*
diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc
index baa0077..fb55d52 100644
--- a/dlls/shell32/shell32_It.rc
+++ b/dlls/shell32/shell32_It.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc
index 6e1ae07..e426ee5 100644
--- a/dlls/shell32/shell32_Ja.rc
+++ b/dlls/shell32/shell32_Ja.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -303,5 +305,3 @@ You should have received a copy of the GNU Lesser General Public \
License along with Wine; if not, write to the Free Software \
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
}
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc
index 16ad3b1..91a327e 100644
--- a/dlls/shell32/shell32_Ko.rc
+++ b/dlls/shell32/shell32_Ko.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc
index 411bbe6..e71c5d0 100644
--- a/dlls/shell32/shell32_Lt.rc
+++ b/dlls/shell32/shell32_Lt.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
/* UTF-8 */
#pragma code_page(65001)
@@ -307,5 +309,3 @@ kopijÄ
kartu su Wine; jei negavote, rašykite adresu \
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, \
Boston, MA 02110-1301, USA."
}
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc
index e5329ee..9ea879d 100644
--- a/dlls/shell32/shell32_Nl.rc
+++ b/dlls/shell32/shell32_Nl.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc
index 82facc0..12ac088 100644
--- a/dlls/shell32/shell32_No.rc
+++ b/dlls/shell32/shell32_No.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc
index 420c167..31c0a8a 100644
--- a/dlls/shell32/shell32_Pl.rc
+++ b/dlls/shell32/shell32_Pl.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc
index ed8b529..7a727ec 100644
--- a/dlls/shell32/shell32_Pt.rc
+++ b/dlls/shell32/shell32_Pt.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc
index cdec0a6..f7a5011 100644
--- a/dlls/shell32/shell32_Ro.rc
+++ b/dlls/shell32/shell32_Ro.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -304,5 +306,3 @@ 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."
}
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc
index 3bcfefd..f8978b9 100644
--- a/dlls/shell32/shell32_Ru.rc
+++ b/dlls/shell32/shell32_Ru.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc
index 24c36c3..76ad64b 100644
--- a/dlls/shell32/shell32_Si.rc
+++ b/dlls/shell32/shell32_Si.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -303,6 +305,3 @@ 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."
}
-
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shell32_Sk.rc b/dlls/shell32/shell32_Sk.rc
index 6ce1f54..1cb1238 100644
--- a/dlls/shell32/shell32_Sk.rc
+++ b/dlls/shell32/shell32_Sk.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
/*
diff --git a/dlls/shell32/shell32_Sv.rc b/dlls/shell32/shell32_Sv.rc
index 208ddd5..29453ac 100644
--- a/dlls/shell32/shell32_Sv.rc
+++ b/dlls/shell32/shell32_Sv.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
/*
diff --git a/dlls/shell32/shell32_Tr.rc b/dlls/shell32/shell32_Tr.rc
index dc2ea30..c8b038a 100644
--- a/dlls/shell32/shell32_Tr.rc
+++ b/dlls/shell32/shell32_Tr.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc
index 624368a..7d1f60a 100644
--- a/dlls/shell32/shell32_Uk.rc
+++ b/dlls/shell32/shell32_Uk.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
MENU_001 MENU DISCARDABLE
diff --git a/dlls/shell32/shell32_Wa.rc b/dlls/shell32/shell32_Wa.rc
index c92e7d2..48b1888 100644
--- a/dlls/shell32/shell32_Wa.rc
+++ b/dlls/shell32/shell32_Wa.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
LANGUAGE LANG_WALON, SUBLANG_DEFAULT
/*
diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc
index 5cc9af9..340b9bd 100644
--- a/dlls/shell32/shell32_Zh.rc
+++ b/dlls/shell32/shell32_Zh.rc
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "shresdef.h"
+
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
@@ -209,5 +211,3 @@ BEGIN
IDS_CPANEL_NAME "å稱"
IDS_CPANEL_DESCRIPTION "æè¿°"
END
-
-#pragma code_page(default)
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index 25b1a2f..8e76a09 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -18,16 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "wingdi.h"
-#include "shlobj.h"
#include "shresdef.h"
-#include "dlgs.h"
-
-#include "version.rc"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -131,40 +122,3 @@ IDR_AVI_FILENUKE AVI searching.avi
/* @makedep: searching.avi */
IDR_AVI_FILEDELETE AVI searching.avi
-
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- * Note that you can and may override resources
- * which also have a neutral version. This is to
- * get localized bitmaps for example.
- */
-#include "shell32_Bg.rc"
-#include "shell32_Ca.rc"
-#include "shell32_Cs.rc"
-#include "shell32_Da.rc"
-#include "shell32_De.rc"
-#include "shell32_En.rc"
-#include "shell32_Eo.rc"
-#include "shell32_Es.rc"
-#include "shell32_Fi.rc"
-#include "shell32_Fr.rc"
-#include "shell32_Hu.rc"
-#include "shell32_It.rc"
-#include "shell32_Ja.rc"
-#include "shell32_Ko.rc"
-#include "shell32_Lt.rc"
-#include "shell32_Nl.rc"
-#include "shell32_No.rc"
-#include "shell32_Pl.rc"
-#include "shell32_Pt.rc"
-#include "shell32_Ro.rc"
-#include "shell32_Ru.rc"
-#include "shell32_Si.rc"
-#include "shell32_Sk.rc"
-#include "shell32_Sv.rc"
-#include "shell32_Tr.rc"
-#include "shell32_Uk.rc"
-#include "shell32_Wa.rc"
-#include "shell32_Zh.rc"
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 01ec977..2880135 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -19,6 +19,13 @@
#ifndef __WINE_SHELL_RES_H
#define __WINE_SHELL_RES_H
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <shlobj.h>
+#include <dlgs.h>
+
/*
columntitles for the shellview
*/
--
1.6.2.5
More information about the wine-patches
mailing list