Module: wine Branch: master Commit: c3067a74d55dc14925e16e6b1c818846c590caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3067a74d55dc14925e16e6b1c...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Jul 2 00:33:39 2009 +0200
localspl: Build language resource files separately.
Do not include them from an other rc file.
---
dlls/localspl/Makefile.in | 18 +++++++++++++++++- dlls/localspl/localspl.rc | 19 ------------------- dlls/localspl/localspl_private.h | 1 + dlls/localspl/spl_Da.rc | 4 +++- dlls/localspl/spl_De.rc | 2 ++ dlls/localspl/spl_En.rc | 2 ++ dlls/localspl/spl_Fr.rc | 2 ++ dlls/localspl/spl_Ko.rc | 2 ++ dlls/localspl/spl_Lt.rc | 4 ++-- dlls/localspl/spl_Nl.rc | 2 ++ dlls/localspl/spl_No.rc | 2 ++ dlls/localspl/spl_Pl.rc | 2 ++ dlls/localspl/spl_Pt.rc | 2 ++ dlls/localspl/spl_Ro.rc | 2 ++ dlls/localspl/spl_Ru.rc | 2 ++ dlls/localspl/spl_Si.rc | 4 ++-- dlls/localspl/spl_Sv.rc | 2 ++ dlls/localspl/spl_Zh.rc | 4 ++-- 18 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 4850363..9fa087d 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -10,7 +10,23 @@ C_SRCS = \ localspl_main.c \ provider.c
-RC_SRCS = localspl.rc +RC_SRCS = \ + localspl.rc \ + spl_Da.rc \ + spl_De.rc \ + spl_En.rc \ + spl_Fr.rc \ + spl_Ko.rc \ + spl_Lt.rc \ + spl_Nl.rc \ + spl_No.rc \ + spl_Pl.rc \ + spl_Pt.rc \ + spl_Ro.rc \ + spl_Ru.rc \ + spl_Si.rc \ + spl_Sv.rc \ + spl_Zh.rc
@MAKE_DLL_RULES@
diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 8d0563f..9757afd 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -19,9 +19,6 @@ * */
-#include "windef.h" -#include "winbase.h" -#include "winver.h" #include "localspl_private.h"
#define WINE_FILENAME_STR "localspl.dll" @@ -35,19 +32,3 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
#include "wine/wine_common_ver.rc" - -#include "spl_En.rc" -#include "spl_Da.rc" -#include "spl_De.rc" -#include "spl_Fr.rc" -#include "spl_Ko.rc" -#include "spl_Lt.rc" -#include "spl_Nl.rc" -#include "spl_No.rc" -#include "spl_Pl.rc" -#include "spl_Pt.rc" -#include "spl_Ro.rc" -#include "spl_Ru.rc" -#include "spl_Si.rc" -#include "spl_Sv.rc" -#include "spl_Zh.rc" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 5174a1a..952c1f6 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -21,6 +21,7 @@ #ifndef __WINE_LOCALSPL_PRIVATE__ #define __WINE_LOCALSPL_PRIVATE__
+#include <windef.h>
/* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance; diff --git a/dlls/localspl/spl_Da.rc b/dlls/localspl/spl_Da.rc index a149cab..cf1f318 100644 --- a/dlls/localspl/spl_Da.rc +++ b/dlls/localspl/spl_Da.rc @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
- LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +#include "localspl_private.h" + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE { diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index 4c95e2b..4e6616e 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc index c9d12f4..d189c26 100644 --- a/dlls/localspl/spl_En.rc +++ b/dlls/localspl/spl_En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc index 9526972..0e93dc8 100644 --- a/dlls/localspl/spl_Fr.rc +++ b/dlls/localspl/spl_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ko.rc b/dlls/localspl/spl_Ko.rc index fe2d572..86db867 100644 --- a/dlls/localspl/spl_Ko.rc +++ b/dlls/localspl/spl_Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Lt.rc b/dlls/localspl/spl_Lt.rc index 321ab06..4c72767 100644 --- a/dlls/localspl/spl_Lt.rc +++ b/dlls/localspl/spl_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -28,5 +30,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Vietinis prievadas" IDS_LOCALMONITOR "Vietinis monitorius" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Nl.rc b/dlls/localspl/spl_Nl.rc index b9d4c5c..bd02446 100644 --- a/dlls/localspl/spl_Nl.rc +++ b/dlls/localspl/spl_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc index 5efa563..b81a7b7 100644 --- a/dlls/localspl/spl_No.rc +++ b/dlls/localspl/spl_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc index a080208..cdbb422 100644 --- a/dlls/localspl/spl_Pl.rc +++ b/dlls/localspl/spl_Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Pt.rc b/dlls/localspl/spl_Pt.rc index 8ec66c5..79506c3 100644 --- a/dlls/localspl/spl_Pt.rc +++ b/dlls/localspl/spl_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ro.rc b/dlls/localspl/spl_Ro.rc index 4432195..499d75b 100644 --- a/dlls/localspl/spl_Ro.rc +++ b/dlls/localspl/spl_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc index 1ee1e2f..fb51446 100644 --- a/dlls/localspl/spl_Ru.rc +++ b/dlls/localspl/spl_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Si.rc b/dlls/localspl/spl_Si.rc index 66ca2c4..11928ab 100644 --- a/dlls/localspl/spl_Si.rc +++ b/dlls/localspl/spl_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "Lokalna vrata" IDS_LOCALMONITOR "Lokalen monitor" } - -#pragma code_page(default) diff --git a/dlls/localspl/spl_Sv.rc b/dlls/localspl/spl_Sv.rc index fca0d6b..2831da6 100644 --- a/dlls/localspl/spl_Sv.rc +++ b/dlls/localspl/spl_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Zh.rc b/dlls/localspl/spl_Zh.rc index c5db382..108cb50 100644 --- a/dlls/localspl/spl_Zh.rc +++ b/dlls/localspl/spl_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "localspl_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -36,5 +38,3 @@ STRINGTABLE DISCARDABLE IDS_LOCALPORT "本地端口" IDS_LOCALMONITOR "本地監視器" } - -#pragma code_page(default)