shlwapi: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Wed Jul 1 17:34:14 CDT 2009
Do not include them from an other rc file.
---
dlls/shlwapi/Makefile.in | 26 +++++++++++++++++++++-
dlls/shlwapi/resource.h | 3 ++
dlls/shlwapi/shlwapi.rc | 51 --------------------------------------------
dlls/shlwapi/shlwapi_Da.rc | 2 +
dlls/shlwapi/shlwapi_De.rc | 2 +
dlls/shlwapi/shlwapi_En.rc | 2 +
dlls/shlwapi/shlwapi_Eo.rc | 2 +
dlls/shlwapi/shlwapi_Es.rc | 2 +
dlls/shlwapi/shlwapi_Fi.rc | 2 +
dlls/shlwapi/shlwapi_Fr.rc | 2 +
dlls/shlwapi/shlwapi_Hu.rc | 2 +
dlls/shlwapi/shlwapi_It.rc | 2 +
dlls/shlwapi/shlwapi_Ja.rc | 4 +-
dlls/shlwapi/shlwapi_Ko.rc | 2 +
dlls/shlwapi/shlwapi_Lt.rc | 4 +-
dlls/shlwapi/shlwapi_Nl.rc | 2 +
dlls/shlwapi/shlwapi_No.rc | 2 +
dlls/shlwapi/shlwapi_Pl.rc | 2 +
dlls/shlwapi/shlwapi_Pt.rc | 2 +
dlls/shlwapi/shlwapi_Ro.rc | 4 +-
dlls/shlwapi/shlwapi_Ru.rc | 2 +
dlls/shlwapi/shlwapi_Si.rc | 4 +-
dlls/shlwapi/shlwapi_Sk.rc | 2 +
dlls/shlwapi/shlwapi_Sv.rc | 2 +
dlls/shlwapi/shlwapi_Tr.rc | 2 +
dlls/shlwapi/shlwapi_Uk.rc | 2 +
dlls/shlwapi/shlwapi_Zh.rc | 4 +-
27 files changed, 76 insertions(+), 62 deletions(-)
delete mode 100644 dlls/shlwapi/shlwapi.rc
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index bafe9f2..20329f6 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -25,7 +25,31 @@ C_SRCS = \
wsprintf.c
RC_SRCS = \
- shlwapi.rc
+ shlwapi_Da.rc \
+ shlwapi_De.rc \
+ shlwapi_En.rc \
+ shlwapi_Eo.rc \
+ shlwapi_Es.rc \
+ shlwapi_Fi.rc \
+ shlwapi_Fr.rc \
+ shlwapi_Hu.rc \
+ shlwapi_It.rc \
+ shlwapi_Ja.rc \
+ shlwapi_Ko.rc \
+ shlwapi_Lt.rc \
+ shlwapi_Nl.rc \
+ shlwapi_No.rc \
+ shlwapi_Pl.rc \
+ shlwapi_Pt.rc \
+ shlwapi_Ro.rc \
+ shlwapi_Ru.rc \
+ shlwapi_Si.rc \
+ shlwapi_Sk.rc \
+ shlwapi_Sv.rc \
+ shlwapi_Tr.rc \
+ shlwapi_Uk.rc \
+ shlwapi_Zh.rc \
+ version.rc
@MAKE_DLL_RULES@
diff --git a/dlls/shlwapi/resource.h b/dlls/shlwapi/resource.h
index e0ca08c..ac53357 100644
--- a/dlls/shlwapi/resource.h
+++ b/dlls/shlwapi/resource.h
@@ -20,6 +20,9 @@
#ifndef WINE_SHLWAPI_RESOURCE_H
#define WINE_SHLWAPI_RESOURCE_H
+#include <windef.h>
+#include <winuser.h>
+
#define IDS_BYTES_FORMAT 64
#define IDS_TIME_INTERVAL_HOURS 65
#define IDS_TIME_INTERVAL_MINUTES 66
diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc
deleted file mode 100644
index f9e6873..0000000
--- a/dlls/shlwapi/shlwapi.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Top level resource file for shlwapi
- *
- * Copyright 2004 Jon Griffiths
- *
- * 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 "winbase.h"
-#include "winuser.h"
-#include "resource.h"
-
-#include "version.rc"
-
-#include "shlwapi_Da.rc"
-#include "shlwapi_De.rc"
-#include "shlwapi_En.rc"
-#include "shlwapi_Eo.rc"
-#include "shlwapi_Es.rc"
-#include "shlwapi_Fi.rc"
-#include "shlwapi_Fr.rc"
-#include "shlwapi_Hu.rc"
-#include "shlwapi_It.rc"
-#include "shlwapi_Ja.rc"
-#include "shlwapi_Ko.rc"
-#include "shlwapi_Lt.rc"
-#include "shlwapi_Nl.rc"
-#include "shlwapi_No.rc"
-#include "shlwapi_Pl.rc"
-#include "shlwapi_Pt.rc"
-#include "shlwapi_Ro.rc"
-#include "shlwapi_Ru.rc"
-#include "shlwapi_Si.rc"
-#include "shlwapi_Sk.rc"
-#include "shlwapi_Sv.rc"
-#include "shlwapi_Tr.rc"
-#include "shlwapi_Uk.rc"
-#include "shlwapi_Zh.rc"
diff --git a/dlls/shlwapi/shlwapi_Da.rc b/dlls/shlwapi/shlwapi_Da.rc
index 4ed0e61..3bb418d 100644
--- a/dlls/shlwapi/shlwapi_Da.rc
+++ b/dlls/shlwapi/shlwapi_Da.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc
index eaad902..f0de193 100644
--- a/dlls/shlwapi/shlwapi_De.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_En.rc b/dlls/shlwapi/shlwapi_En.rc
index 5a327f0..4e1d935 100644
--- a/dlls/shlwapi/shlwapi_En.rc
+++ b/dlls/shlwapi/shlwapi_En.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Eo.rc b/dlls/shlwapi/shlwapi_Eo.rc
index 71b3710..ce7833d 100644
--- a/dlls/shlwapi/shlwapi_Eo.rc
+++ b/dlls/shlwapi/shlwapi_Eo.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Es.rc b/dlls/shlwapi/shlwapi_Es.rc
index 3a325db..8d351f6 100644
--- a/dlls/shlwapi/shlwapi_Es.rc
+++ b/dlls/shlwapi/shlwapi_Es.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Fi.rc b/dlls/shlwapi/shlwapi_Fi.rc
index ea9b395..877228f 100644
--- a/dlls/shlwapi/shlwapi_Fi.rc
+++ b/dlls/shlwapi/shlwapi_Fi.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc
index 842a67c..26cada0 100644
--- a/dlls/shlwapi/shlwapi_Fr.rc
+++ b/dlls/shlwapi/shlwapi_Fr.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Hu.rc b/dlls/shlwapi/shlwapi_Hu.rc
index 9aa253e..56535e8 100644
--- a/dlls/shlwapi/shlwapi_Hu.rc
+++ b/dlls/shlwapi/shlwapi_Hu.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc
index b62f494..e7a984e 100644
--- a/dlls/shlwapi/shlwapi_It.rc
+++ b/dlls/shlwapi/shlwapi_It.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Ja.rc b/dlls/shlwapi/shlwapi_Ja.rc
index accd716..4b9c6ae 100644
--- a/dlls/shlwapi/shlwapi_Ja.rc
+++ b/dlls/shlwapi/shlwapi_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)
@@ -44,5 +46,3 @@ STRINGTABLE DISCARDABLE
IDS_TIME_INTERVAL_MINUTES " min"
IDS_TIME_INTERVAL_SECONDS " sec"
}
-
-#pragma code_page(default)
diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc
index 8a44a66..3526cac 100644
--- a/dlls/shlwapi/shlwapi_Ko.rc
+++ b/dlls/shlwapi/shlwapi_Ko.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Lt.rc b/dlls/shlwapi/shlwapi_Lt.rc
index 9ef2593..264f6f6 100644
--- a/dlls/shlwapi/shlwapi_Lt.rc
+++ b/dlls/shlwapi/shlwapi_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)
@@ -44,5 +46,3 @@ STRINGTABLE DISCARDABLE
IDS_TIME_INTERVAL_MINUTES " min"
IDS_TIME_INTERVAL_SECONDS " sek"
}
-
-#pragma code_page(default)
diff --git a/dlls/shlwapi/shlwapi_Nl.rc b/dlls/shlwapi/shlwapi_Nl.rc
index c7ac3e7..0c9e3cb 100644
--- a/dlls/shlwapi/shlwapi_Nl.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_No.rc b/dlls/shlwapi/shlwapi_No.rc
index 4df42c8..9a99ac3 100644
--- a/dlls/shlwapi/shlwapi_No.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Pl.rc b/dlls/shlwapi/shlwapi_Pl.rc
index 467ee8d..8a0032c 100644
--- a/dlls/shlwapi/shlwapi_Pl.rc
+++ b/dlls/shlwapi/shlwapi_Pl.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc
index 839fa13..9974fd6 100644
--- a/dlls/shlwapi/shlwapi_Pt.rc
+++ b/dlls/shlwapi/shlwapi_Pt.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Ro.rc b/dlls/shlwapi/shlwapi_Ro.rc
index 9b6278f..800f259 100644
--- a/dlls/shlwapi/shlwapi_Ro.rc
+++ b/dlls/shlwapi/shlwapi_Ro.rc
@@ -17,6 +17,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)
@@ -42,5 +44,3 @@ STRINGTABLE DISCARDABLE
IDS_TIME_INTERVAL_MINUTES " min"
IDS_TIME_INTERVAL_SECONDS " sec"
}
-
-#pragma code_page(default)
diff --git a/dlls/shlwapi/shlwapi_Ru.rc b/dlls/shlwapi/shlwapi_Ru.rc
index 87aee4a..47479e2 100644
--- a/dlls/shlwapi/shlwapi_Ru.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Si.rc b/dlls/shlwapi/shlwapi_Si.rc
index ed5a92e..820b6ce 100644
--- a/dlls/shlwapi/shlwapi_Si.rc
+++ b/dlls/shlwapi/shlwapi_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
@@ -43,5 +45,3 @@ STRINGTABLE DISCARDABLE
IDS_TIME_INTERVAL_MINUTES " min"
IDS_TIME_INTERVAL_SECONDS " sek"
}
-
-#pragma code_page(default)
diff --git a/dlls/shlwapi/shlwapi_Sk.rc b/dlls/shlwapi/shlwapi_Sk.rc
index e5479e9..c44ca3f 100644
--- a/dlls/shlwapi/shlwapi_Sk.rc
+++ b/dlls/shlwapi/shlwapi_Sk.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Sv.rc b/dlls/shlwapi/shlwapi_Sv.rc
index 6e13b91..6a0d52b 100644
--- a/dlls/shlwapi/shlwapi_Sv.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Tr.rc b/dlls/shlwapi/shlwapi_Tr.rc
index 1545362..5851596 100644
--- a/dlls/shlwapi/shlwapi_Tr.rc
+++ b/dlls/shlwapi/shlwapi_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
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Uk.rc b/dlls/shlwapi/shlwapi_Uk.rc
index a8a1e3d..c14a7ce 100644
--- a/dlls/shlwapi/shlwapi_Uk.rc
+++ b/dlls/shlwapi/shlwapi_Uk.rc
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "resource.h"
+
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60
diff --git a/dlls/shlwapi/shlwapi_Zh.rc b/dlls/shlwapi/shlwapi_Zh.rc
index 842bb15..0a1d9a6 100644
--- a/dlls/shlwapi/shlwapi_Zh.rc
+++ b/dlls/shlwapi/shlwapi_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)
@@ -68,5 +70,3 @@ STRINGTABLE DISCARDABLE
IDS_TIME_INTERVAL_MINUTES " 分"
IDS_TIME_INTERVAL_SECONDS " 秒"
}
-
-#pragma code_page(default)
--
1.6.3.3
More information about the wine-patches
mailing list