[PATCH 2/2] wineps.drv: Build language resource files separately.
Michael Stefaniuc
mstefani at redhat.de
Thu Jul 2 18:40:09 CDT 2009
Do not include them from an other rc file.
---
dlls/wineps.drv/Makefile.in | 25 ++++++++++++++++++-
dlls/wineps.drv/psdlg.h | 3 ++
dlls/wineps.drv/rsrc.rc | 57 -------------------------------------------
dlls/wineps.drv/wps_Bg.rc | 2 +
dlls/wineps.drv/wps_Cs.rc | 2 +
dlls/wineps.drv/wps_Da.rc | 2 +
dlls/wineps.drv/wps_De.rc | 2 +
dlls/wineps.drv/wps_En.rc | 2 +
dlls/wineps.drv/wps_Es.rc | 2 +
dlls/wineps.drv/wps_Fr.rc | 2 +
dlls/wineps.drv/wps_Hu.rc | 2 +
dlls/wineps.drv/wps_It.rc | 2 +
dlls/wineps.drv/wps_Ja.rc | 4 +-
dlls/wineps.drv/wps_Ko.rc | 2 +
dlls/wineps.drv/wps_Lt.rc | 3 +-
dlls/wineps.drv/wps_Nl.rc | 2 +
dlls/wineps.drv/wps_No.rc | 2 +
dlls/wineps.drv/wps_Pl.rc | 2 +
dlls/wineps.drv/wps_Pt.rc | 2 +
dlls/wineps.drv/wps_Ro.rc | 4 +-
dlls/wineps.drv/wps_Ru.rc | 2 +
dlls/wineps.drv/wps_Si.rc | 2 +
dlls/wineps.drv/wps_Sk.rc | 2 +
dlls/wineps.drv/wps_Sv.rc | 2 +
dlls/wineps.drv/wps_Tr.rc | 2 +
dlls/wineps.drv/wps_Zh.rc | 4 +-
26 files changed, 73 insertions(+), 65 deletions(-)
delete mode 100644 dlls/wineps.drv/rsrc.rc
diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in
index 52bc28f..0adfc0c 100644
--- a/dlls/wineps.drv/Makefile.in
+++ b/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
diff --git a/dlls/wineps.drv/psdlg.h b/dlls/wineps.drv/psdlg.h
index f16c683..24e4291 100644
--- a/dlls/wineps.drv/psdlg.h
+++ b/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
diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc
deleted file mode 100644
index 2529bf0..0000000
--- a/dlls/wineps.drv/rsrc.rc
+++ /dev/null
@@ -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"
diff --git a/dlls/wineps.drv/wps_Bg.rc b/dlls/wineps.drv/wps_Bg.rc
index 423d148..fb256f8 100644
--- a/dlls/wineps.drv/wps_Bg.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Cs.rc b/dlls/wineps.drv/wps_Cs.rc
index f8806c9..9378ebc 100644
--- a/dlls/wineps.drv/wps_Cs.rc
+++ b/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 */
diff --git a/dlls/wineps.drv/wps_Da.rc b/dlls/wineps.drv/wps_Da.rc
index 1fa6a58..a2c11b3 100644
--- a/dlls/wineps.drv/wps_Da.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_De.rc b/dlls/wineps.drv/wps_De.rc
index 6d0df40..9ebaf3c 100644
--- a/dlls/wineps.drv/wps_De.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_En.rc b/dlls/wineps.drv/wps_En.rc
index d29a582..be31f87 100644
--- a/dlls/wineps.drv/wps_En.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Es.rc b/dlls/wineps.drv/wps_Es.rc
index 6f488f5..c363f73 100644
--- a/dlls/wineps.drv/wps_Es.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Fr.rc b/dlls/wineps.drv/wps_Fr.rc
index 6bdadb7..5bac15c 100644
--- a/dlls/wineps.drv/wps_Fr.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Hu.rc b/dlls/wineps.drv/wps_Hu.rc
index 2b74b42..b5d17c9 100644
--- a/dlls/wineps.drv/wps_Hu.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_It.rc b/dlls/wineps.drv/wps_It.rc
index 7cb3ea2..120919b 100644
--- a/dlls/wineps.drv/wps_It.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Ja.rc b/dlls/wineps.drv/wps_Ja.rc
index 4e15f27..be2e8ec 100644
--- a/dlls/wineps.drv/wps_Ja.rc
+++ b/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)
diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc
index f84add2..8e0c9a3 100644
--- a/dlls/wineps.drv/wps_Ko.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Lt.rc b/dlls/wineps.drv/wps_Lt.rc
index 5476cb1..d77e7f1 100644
--- a/dlls/wineps.drv/wps_Lt.rc
+++ b/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)
diff --git a/dlls/wineps.drv/wps_Nl.rc b/dlls/wineps.drv/wps_Nl.rc
index 4254e82..e5b1f9c 100644
--- a/dlls/wineps.drv/wps_Nl.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_No.rc b/dlls/wineps.drv/wps_No.rc
index e9a5904..eaa7eac 100644
--- a/dlls/wineps.drv/wps_No.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Pl.rc b/dlls/wineps.drv/wps_Pl.rc
index a64e25c..dcc226c 100644
--- a/dlls/wineps.drv/wps_Pl.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Pt.rc b/dlls/wineps.drv/wps_Pt.rc
index 062ed05..03cae19 100644
--- a/dlls/wineps.drv/wps_Pt.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Ro.rc b/dlls/wineps.drv/wps_Ro.rc
index a9f7d1e..73064a4 100644
--- a/dlls/wineps.drv/wps_Ro.rc
+++ b/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)
diff --git a/dlls/wineps.drv/wps_Ru.rc b/dlls/wineps.drv/wps_Ru.rc
index d009c44..5250407 100644
--- a/dlls/wineps.drv/wps_Ru.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Si.rc b/dlls/wineps.drv/wps_Si.rc
index e1b1a9a..c061455 100644
--- a/dlls/wineps.drv/wps_Si.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Sk.rc b/dlls/wineps.drv/wps_Sk.rc
index 541f373..baac24d 100644
--- a/dlls/wineps.drv/wps_Sk.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Sv.rc b/dlls/wineps.drv/wps_Sv.rc
index 7aa2308..af58d27 100644
--- a/dlls/wineps.drv/wps_Sv.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Tr.rc b/dlls/wineps.drv/wps_Tr.rc
index c13bc08..ec90988 100644
--- a/dlls/wineps.drv/wps_Tr.rc
+++ b/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
diff --git a/dlls/wineps.drv/wps_Zh.rc b/dlls/wineps.drv/wps_Zh.rc
index 50fc5e6..0bb9ab4 100644
--- a/dlls/wineps.drv/wps_Zh.rc
+++ b/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)
--
1.6.3.3
More information about the wine-patches
mailing list