localspl: Build language resource files separately.

Do not include them from an other rc file.

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@
 

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"

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;

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
 {

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

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

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

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

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)

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

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

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

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

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

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

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)

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

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)