wineps.drv: Build language resource files separately.

Do not include them from an other rc file.

dlls/wineps.drv/Makefile.in

@@ -69,7 +69,30 @@ C_SRCS = \
 	type1afm.c \
 	type42.c
 
-RC_SRCS= rsrc.rc
+RC_SRCS= \
+	wps_Bg.rc \
+	wps_Cs.rc \
+	wps_Da.rc \
+	wps_De.rc \
+	wps_En.rc \
+	wps_Es.rc \
+	wps_Fr.rc \
+	wps_Hu.rc \
+	wps_It.rc \
+	wps_Ja.rc \
+	wps_Ko.rc \
+	wps_Lt.rc \
+	wps_Nl.rc \
+	wps_No.rc \
+	wps_Pl.rc \
+	wps_Pt.rc \
+	wps_Ro.rc \
+	wps_Ru.rc \
+	wps_Si.rc \
+	wps_Sk.rc \
+	wps_Sv.rc \
+	wps_Tr.rc \
+	wps_Zh.rc
 
 EXTRASUBDIRS = data
 

dlls/wineps.drv/psdlg.h

@@ -21,6 +21,9 @@
 #ifndef __WINE_PSDLG_H
 #define __WINE_PSDLG_H
 
+#include <windef.h>
+#include <winuser.h>
+
 #define IDD_PAPERS 100
 #define IDD_ORIENT_PORTRAIT  101
 #define IDD_ORIENT_LANDSCAPE 102

dlls/wineps.drv/rsrc.rc

@@ -1,57 +0,0 @@
-/*
- * Top level resource file for wineps
- *
- * Copyright 2000 Huw D M Davies
- *
- * 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 "winnls.h"
-#include "psdlg.h"
-
-
-/*
- * 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 "wps_Bg.rc"
-#include "wps_Cs.rc"
-#include "wps_Da.rc"
-#include "wps_De.rc"
-#include "wps_En.rc"
-#include "wps_Es.rc"
-#include "wps_Fr.rc"
-#include "wps_Hu.rc"
-#include "wps_It.rc"
-#include "wps_Ja.rc"
-#include "wps_Ko.rc"
-#include "wps_Lt.rc"
-#include "wps_Nl.rc"
-#include "wps_No.rc"
-#include "wps_Pt.rc"
-#include "wps_Pl.rc"
-#include "wps_Ro.rc"
-#include "wps_Ru.rc"
-#include "wps_Si.rc"
-#include "wps_Sk.rc"
-#include "wps_Sv.rc"
-#include "wps_Tr.rc"
-#include "wps_Zh.rc"

dlls/wineps.drv/wps_Bg.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Cs.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

dlls/wineps.drv/wps_Da.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_De.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_En.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Es.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Fr.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Hu.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_It.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Ja.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -38,5 +40,3 @@ FONT 9, "MS Shell Dlg"
  COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS |
         WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/wineps.drv/wps_Ko.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Lt.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -38,4 +40,3 @@ FONT 8, "MS Shell Dlg"
  COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS |
         WS_TABSTOP
 }
-#pragma code_page(default)

dlls/wineps.drv/wps_Nl.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_No.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Pl.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Pt.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Ro.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -38,5 +40,3 @@ FONT 8, "MS Shell Dlg"
  COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS |
         WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/wineps.drv/wps_Ru.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 /* Russian strings in cp1251 */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

dlls/wineps.drv/wps_Si.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Sk.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Sv.rc

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Tr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215

dlls/wineps.drv/wps_Zh.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "psdlg.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -60,5 +62,3 @@ FONT 9, "MS Shell Dlg"
  COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS |
         WS_TABSTOP
 }
-
-#pragma code_page(default)