msrle32: Build language resource files separately (Resend)

Michael Stefaniuc mstefani at redhat.de
Tue Jun 30 06:13:57 CDT 2009


instead of including them from an other rc file.
---
 dlls/msrle32/Makefile.in |   23 ++++++++++++++++++-
 dlls/msrle32/msrle_Bg.rc |    2 +
 dlls/msrle32/msrle_Cs.rc |    2 +
 dlls/msrle32/msrle_Da.rc |    2 +
 dlls/msrle32/msrle_De.rc |    2 +
 dlls/msrle32/msrle_En.rc |    2 +
 dlls/msrle32/msrle_Es.rc |    2 +
 dlls/msrle32/msrle_Fr.rc |    2 +
 dlls/msrle32/msrle_Hu.rc |    2 +
 dlls/msrle32/msrle_It.rc |    2 +
 dlls/msrle32/msrle_Ja.rc |    4 +-
 dlls/msrle32/msrle_Ko.rc |    2 +
 dlls/msrle32/msrle_Lt.rc |    4 +-
 dlls/msrle32/msrle_Nl.rc |    2 +
 dlls/msrle32/msrle_No.rc |    2 +
 dlls/msrle32/msrle_Pl.rc |    2 +
 dlls/msrle32/msrle_Pt.rc |    2 +
 dlls/msrle32/msrle_Ro.rc |    4 +-
 dlls/msrle32/msrle_Ru.rc |    2 +
 dlls/msrle32/msrle_Si.rc |    4 +-
 dlls/msrle32/msrle_Sv.rc |    2 +
 dlls/msrle32/msrle_Tr.rc |    2 +
 dlls/msrle32/rsrc.rc     |   54 ----------------------------------------------
 23 files changed, 64 insertions(+), 63 deletions(-)
 delete mode 100644 dlls/msrle32/rsrc.rc

diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in
index eef540b..df92201 100644
--- a/dlls/msrle32/Makefile.in
+++ b/dlls/msrle32/Makefile.in
@@ -7,7 +7,28 @@ IMPORTS   = winmm user32 kernel32
 
 C_SRCS = msrle32.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	msrle_Bg.rc \
+	msrle_Cs.rc \
+	msrle_Da.rc \
+	msrle_De.rc \
+	msrle_En.rc \
+	msrle_Es.rc \
+	msrle_Fr.rc \
+	msrle_Hu.rc \
+	msrle_It.rc \
+	msrle_Ja.rc \
+	msrle_Ko.rc \
+	msrle_Lt.rc \
+	msrle_Nl.rc \
+	msrle_No.rc \
+	msrle_Pl.rc \
+	msrle_Pt.rc \
+	msrle_Ro.rc \
+	msrle_Ru.rc \
+	msrle_Si.rc \
+	msrle_Sv.rc \
+	msrle_Tr.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/msrle32/msrle_Bg.rc b/dlls/msrle32/msrle_Bg.rc
index 7c0d448..5073f0b 100644
--- a/dlls/msrle32/msrle_Bg.rc
+++ b/dlls/msrle32/msrle_Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Cs.rc b/dlls/msrle32/msrle_Cs.rc
index 51fb1df..a4a6c2f 100644
--- a/dlls/msrle32/msrle_Cs.rc
+++ b/dlls/msrle32/msrle_Cs.rc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/dlls/msrle32/msrle_Da.rc b/dlls/msrle32/msrle_Da.rc
index c3ea57b..4ab40e3 100644
--- a/dlls/msrle32/msrle_Da.rc
+++ b/dlls/msrle32/msrle_Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_De.rc b/dlls/msrle32/msrle_De.rc
index c5f4954..dd1cc7d 100644
--- a/dlls/msrle32/msrle_De.rc
+++ b/dlls/msrle32/msrle_De.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_En.rc b/dlls/msrle32/msrle_En.rc
index 030a98a..becd9d9 100644
--- a/dlls/msrle32/msrle_En.rc
+++ b/dlls/msrle32/msrle_En.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Es.rc b/dlls/msrle32/msrle_Es.rc
index ca418cb..edb6214 100644
--- a/dlls/msrle32/msrle_Es.rc
+++ b/dlls/msrle32/msrle_Es.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Fr.rc b/dlls/msrle32/msrle_Fr.rc
index e6eb314..001d37e 100644
--- a/dlls/msrle32/msrle_Fr.rc
+++ b/dlls/msrle32/msrle_Fr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Hu.rc b/dlls/msrle32/msrle_Hu.rc
index 95016ac..3f4b581 100644
--- a/dlls/msrle32/msrle_Hu.rc
+++ b/dlls/msrle32/msrle_Hu.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_It.rc b/dlls/msrle32/msrle_It.rc
index 695a782..0b21705 100644
--- a/dlls/msrle32/msrle_It.rc
+++ b/dlls/msrle32/msrle_It.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Ja.rc b/dlls/msrle32/msrle_Ja.rc
index c2866a1..e1ec7bb 100644
--- a/dlls/msrle32/msrle_Ja.rc
+++ b/dlls/msrle32/msrle_Ja.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -29,5 +31,3 @@ STRINGTABLE DISCARDABLE
 	IDS_DESCRIPTION	"Wine MS-RLE ビデオコーデック"
 	IDS_ABOUT       "Wine MS-RLE ビデオコーデック\nCopyright 2002 by Michael Günewig"
 }
-
-#pragma code_page(default)
diff --git a/dlls/msrle32/msrle_Ko.rc b/dlls/msrle32/msrle_Ko.rc
index 3f9d137..f6c38b3 100644
--- a/dlls/msrle32/msrle_Ko.rc
+++ b/dlls/msrle32/msrle_Ko.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Lt.rc b/dlls/msrle32/msrle_Lt.rc
index 26e661b..f399f54 100644
--- a/dlls/msrle32/msrle_Lt.rc
+++ b/dlls/msrle32/msrle_Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -29,5 +31,3 @@ STRINGTABLE DISCARDABLE
 	IDS_DESCRIPTION	"Wine MS-RLE vaizdo kodekas"
 	IDS_ABOUT       "Wine MS-RLE vaizdo kodekas\nAutoriaus teisės Michael Günnewig, 2002"
 }
-
-#pragma code_page(default)
diff --git a/dlls/msrle32/msrle_Nl.rc b/dlls/msrle32/msrle_Nl.rc
index f98f5fd..ba0419c 100644
--- a/dlls/msrle32/msrle_Nl.rc
+++ b/dlls/msrle32/msrle_Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_No.rc b/dlls/msrle32/msrle_No.rc
index 411e459..6b079f9 100644
--- a/dlls/msrle32/msrle_No.rc
+++ b/dlls/msrle32/msrle_No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Pl.rc b/dlls/msrle32/msrle_Pl.rc
index 013fea5..9394da1 100644
--- a/dlls/msrle32/msrle_Pl.rc
+++ b/dlls/msrle32/msrle_Pl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Pt.rc b/dlls/msrle32/msrle_Pt.rc
index cc74b38..33a6462 100644
--- a/dlls/msrle32/msrle_Pt.rc
+++ b/dlls/msrle32/msrle_Pt.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Ro.rc b/dlls/msrle32/msrle_Ro.rc
index 64366c3..16aa0e9 100644
--- a/dlls/msrle32/msrle_Ro.rc
+++ b/dlls/msrle32/msrle_Ro.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE
     IDS_DESCRIPTION     "Codecul video Wine MS-RLE"
     IDS_ABOUT           "Codecul video Wine MS-RLE\nCopyright 2002 by Michael Günnewig"
 }
-
-#pragma code_page(default)
diff --git a/dlls/msrle32/msrle_Ru.rc b/dlls/msrle32/msrle_Ru.rc
index 4f8bd56..4ae0101 100644
--- a/dlls/msrle32/msrle_Ru.rc
+++ b/dlls/msrle32/msrle_Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Si.rc b/dlls/msrle32/msrle_Si.rc
index eeb2373..346569b 100644
--- a/dlls/msrle32/msrle_Si.rc
+++ b/dlls/msrle32/msrle_Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -28,5 +30,3 @@ STRINGTABLE DISCARDABLE
 	IDS_DESCRIPTION	"Wine MS-RLE video kodek"
 	IDS_ABOUT       "Wine MS-RLE video kodek\nCopyright 2002 by Michael Günnewig"
 }
-
-#pragma code_page(default)
diff --git a/dlls/msrle32/msrle_Sv.rc b/dlls/msrle32/msrle_Sv.rc
index fba656a..4570e60 100644
--- a/dlls/msrle32/msrle_Sv.rc
+++ b/dlls/msrle32/msrle_Sv.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/msrle_Tr.rc b/dlls/msrle32/msrle_Tr.rc
index 36cee75..8decf37 100644
--- a/dlls/msrle32/msrle_Tr.rc
+++ b/dlls/msrle32/msrle_Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "msrle_private.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
diff --git a/dlls/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc
deleted file mode 100644
index 09d2cf2..0000000
--- a/dlls/msrle32/rsrc.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Top level resource file for MS-RLE
- *
- * Copyright 2002 Michael Günnewig
- *
- * 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 "msrle_private.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 "msrle_Bg.rc"
-#include "msrle_Cs.rc"
-#include "msrle_Da.rc"
-#include "msrle_De.rc"
-#include "msrle_En.rc"
-#include "msrle_Es.rc"
-#include "msrle_Fr.rc"
-#include "msrle_Hu.rc"
-#include "msrle_It.rc"
-#include "msrle_Ja.rc"
-#include "msrle_Ko.rc"
-#include "msrle_Lt.rc"
-#include "msrle_Nl.rc"
-#include "msrle_No.rc"
-#include "msrle_Pl.rc"
-#include "msrle_Pt.rc"
-#include "msrle_Ro.rc"
-#include "msrle_Ru.rc"
-#include "msrle_Si.rc"
-#include "msrle_Sv.rc"
-#include "msrle_Tr.rc"
-- 
1.6.2.5



More information about the wine-patches mailing list