Michael Stefaniuc : shdoclc: Build language resource files separately.

Alexandre Julliard julliard at winehq.org
Thu Jul 2 08:25:06 CDT 2009


Module: wine
Branch: master
Commit: 8919ba34987ae121c35aeb39e81ae7bfb738424d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8919ba34987ae121c35aeb39e81ae7bfb738424d

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jul  2 00:28:07 2009 +0200

shdoclc: Build language resource files separately.

Do not include them from an other rc file.

---

 dlls/shdoclc/Bg.rc       |    1 +
 dlls/shdoclc/Da.rc       |    1 +
 dlls/shdoclc/De.rc       |    1 +
 dlls/shdoclc/En.rc       |    1 +
 dlls/shdoclc/Es.rc       |    1 +
 dlls/shdoclc/Fi.rc       |    1 +
 dlls/shdoclc/Fr.rc       |    1 +
 dlls/shdoclc/Hu.rc       |    1 +
 dlls/shdoclc/Ko.rc       |    1 +
 dlls/shdoclc/Lt.rc       |    4 ++--
 dlls/shdoclc/Makefile.in |   20 +++++++++++++++++++-
 dlls/shdoclc/Nl.rc       |    1 +
 dlls/shdoclc/No.rc       |    1 +
 dlls/shdoclc/Pt.rc       |    1 +
 dlls/shdoclc/Ru.rc       |    1 +
 dlls/shdoclc/Si.rc       |    3 +--
 dlls/shdoclc/Sv.rc       |    1 +
 dlls/shdoclc/Tr.rc       |    1 +
 dlls/shdoclc/Zh.rc       |    3 +--
 dlls/shdoclc/rsrc.rc     |   42 ------------------------------------------
 dlls/shdoclc/shdoclc.h   |    3 +++
 21 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/dlls/shdoclc/Bg.rc b/dlls/shdoclc/Bg.rc
index 814ac7c..0cec8ec 100644
--- a/dlls/shdoclc/Bg.rc
+++ b/dlls/shdoclc/Bg.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Da.rc b/dlls/shdoclc/Da.rc
index 5f22bc8..8a25db9 100644
--- a/dlls/shdoclc/Da.rc
+++ b/dlls/shdoclc/Da.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/De.rc b/dlls/shdoclc/De.rc
index c202773..f2fd672 100644
--- a/dlls/shdoclc/De.rc
+++ b/dlls/shdoclc/De.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc
index d237c51..b3823c2 100644
--- a/dlls/shdoclc/En.rc
+++ b/dlls/shdoclc/En.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Es.rc b/dlls/shdoclc/Es.rc
index 8be9757..fd2e3c7 100644
--- a/dlls/shdoclc/Es.rc
+++ b/dlls/shdoclc/Es.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/Fi.rc b/dlls/shdoclc/Fi.rc
index 81233d3..ae5e0c2 100644
--- a/dlls/shdoclc/Fi.rc
+++ b/dlls/shdoclc/Fi.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Fr.rc b/dlls/shdoclc/Fr.rc
index 75aefc7..216babb 100644
--- a/dlls/shdoclc/Fr.rc
+++ b/dlls/shdoclc/Fr.rc
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/Hu.rc b/dlls/shdoclc/Hu.rc
index 9ed68ca..2fdc4c2 100644
--- a/dlls/shdoclc/Hu.rc
+++ b/dlls/shdoclc/Hu.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc
index d038994..6bf28d1 100644
--- a/dlls/shdoclc/Ko.rc
+++ b/dlls/shdoclc/Ko.rc
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Lt.rc b/dlls/shdoclc/Lt.rc
index b3a0641..331e0a9 100644
--- a/dlls/shdoclc/Lt.rc
+++ b/dlls/shdoclc/Lt.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -247,5 +249,3 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "Slinkti dešinėn",   IDM_SCROLL_RIGHT
     }
 }
-
-#pragma code_page(default)
diff --git a/dlls/shdoclc/Makefile.in b/dlls/shdoclc/Makefile.in
index 4045ecf..d053a9d 100644
--- a/dlls/shdoclc/Makefile.in
+++ b/dlls/shdoclc/Makefile.in
@@ -5,7 +5,25 @@ VPATH     = @srcdir@
 MODULE    = shdoclc.dll
 IMPORTS   = kernel32
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Bg.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Es.rc \
+	Fi.rc \
+	Fr.rc \
+	Hu.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/shdoclc/Nl.rc b/dlls/shdoclc/Nl.rc
index 3f76475..c10e803 100644
--- a/dlls/shdoclc/Nl.rc
+++ b/dlls/shdoclc/Nl.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/No.rc b/dlls/shdoclc/No.rc
index 6c38a1f..65f554a 100644
--- a/dlls/shdoclc/No.rc
+++ b/dlls/shdoclc/No.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc
index 393037f..64379f4 100644
--- a/dlls/shdoclc/Pt.rc
+++ b/dlls/shdoclc/Pt.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc
index f20c2f4..11db872 100644
--- a/dlls/shdoclc/Ru.rc
+++ b/dlls/shdoclc/Ru.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Si.rc b/dlls/shdoclc/Si.rc
index ccc7900..c95dc01 100644
--- a/dlls/shdoclc/Si.rc
+++ b/dlls/shdoclc/Si.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
@@ -247,5 +248,3 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "Drsenje desno", IDM_SCROLL_RIGHT
     }
 }
-
-#pragma code_page(default)
diff --git a/dlls/shdoclc/Sv.rc b/dlls/shdoclc/Sv.rc
index 9b20705..277745d 100644
--- a/dlls/shdoclc/Sv.rc
+++ b/dlls/shdoclc/Sv.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
diff --git a/dlls/shdoclc/Tr.rc b/dlls/shdoclc/Tr.rc
index 8bd4ed0..ea238e1 100644
--- a/dlls/shdoclc/Tr.rc
+++ b/dlls/shdoclc/Tr.rc
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
diff --git a/dlls/shdoclc/Zh.rc b/dlls/shdoclc/Zh.rc
index f3570e8..c597676 100644
--- a/dlls/shdoclc/Zh.rc
+++ b/dlls/shdoclc/Zh.rc
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "shdoclc.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
@@ -479,5 +480,3 @@ IDR_BROWSE_CONTEXT_MENU MENU
         MENUITEM "向右滾動", IDM_SCROLL_RIGHT
     }
 }
-
-#pragma code_page(default)
diff --git a/dlls/shdoclc/rsrc.rc b/dlls/shdoclc/rsrc.rc
deleted file mode 100644
index 641c4c9..0000000
--- a/dlls/shdoclc/rsrc.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2005 Jacek Caban
- *
- * 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 "winuser.h"
-#include "mshtmcid.h"
-
-#include "shdoclc.h"
-
-#include "Bg.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
diff --git a/dlls/shdoclc/shdoclc.h b/dlls/shdoclc/shdoclc.h
index 2bc7626..b5492d6 100644
--- a/dlls/shdoclc/shdoclc.h
+++ b/dlls/shdoclc/shdoclc.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <mshtmcid.h>
+
 #define IDS_MESSAGE_BOX_TITLE   2213
 
 #define IDS_PRINT_HEADER_TEMPLATE  8403




More information about the wine-cvs mailing list