hhctrl.ocx: Build language resource files separately.

Do not include them from an other rc file.
2009-07-01 10:17:48 +02:00 · 2009-07-01 10:17:48 +02:00 · 46e5df5cb2
parent 7cf2855cf7
commit 46e5df5cb2
22 changed files with 64 additions and 57 deletions
--- a/dlls/hhctrl.ocx/Cs.rc
+++ b/dlls/hhctrl.ocx/Cs.rc
@ -21,6 +21,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 /* Czech strings in CP1250 */
--- a/dlls/hhctrl.ocx/Da.rc
+++ b/dlls/hhctrl.ocx/Da.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/De.rc
+++ b/dlls/hhctrl.ocx/De.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/El.rc
+++ b/dlls/hhctrl.ocx/El.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/En.rc
+++ b/dlls/hhctrl.ocx/En.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Fi.rc
+++ b/dlls/hhctrl.ocx/Fi.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Fr.rc
+++ b/dlls/hhctrl.ocx/Fr.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Hu.rc
+++ b/dlls/hhctrl.ocx/Hu.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Ko.rc
+++ b/dlls/hhctrl.ocx/Ko.rc
@ -20,6 +20,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Lt.rc
+++ b/dlls/hhctrl.ocx/Lt.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)

@ -59,5 +61,3 @@ BEGIN
    IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
    IDTB_TOC_PREV    "IDTB_TOC_PREV"
 END
-
-#pragma code_page(default)
--- a/dlls/hhctrl.ocx/Makefile.in
+++ b/dlls/hhctrl.ocx/Makefile.in
@ -13,7 +13,27 @@ C_SRCS = \
 	regsvr.c \
 	webbrowser.c

-RC_SRCS = hhctrl.rc
+RC_SRCS = \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	El.rc \
+	En.rc \
+	Fi.rc \
+	Fr.rc \
+	Hu.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc \
+	version.rc

@MAKE_DLL_RULES@

--- a/dlls/hhctrl.ocx/Nl.rc
+++ b/dlls/hhctrl.ocx/Nl.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/No.rc
+++ b/dlls/hhctrl.ocx/No.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Pl.rc
+++ b/dlls/hhctrl.ocx/Pl.rc
@ -20,6 +20,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Pt.rc
+++ b/dlls/hhctrl.ocx/Pt.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Ru.rc
+++ b/dlls/hhctrl.ocx/Ru.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Si.rc
+++ b/dlls/hhctrl.ocx/Si.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 #pragma code_page(65001)

 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@ -58,5 +60,3 @@ BEGIN
    IDTB_TOC_NEXT    "IDTB_TOC_NEXT"
    IDTB_TOC_PREV    "IDTB_TOC_PREV"
 END
-
-#pragma code_page(default)
--- a/dlls/hhctrl.ocx/Sv.rc
+++ b/dlls/hhctrl.ocx/Sv.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Tr.rc
+++ b/dlls/hhctrl.ocx/Tr.rc
@ -19,6 +19,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/dlls/hhctrl.ocx/Zh.rc
+++ b/dlls/hhctrl.ocx/Zh.rc
@ -18,6 +18,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include "resource.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

@ -96,5 +98,3 @@ BEGIN
    IDTB_TOC_NEXT    "後一項"
    IDTB_TOC_PREV    "前一項"
 END
-
-#pragma code_page(default)
--- a/dlls/hhctrl.ocx/hhctrl.rc
+++ b/dlls/hhctrl.ocx/hhctrl.rc
@ -1,50 +0,0 @@
-/*
- * HTML Help resources
- *
- * Copyright 2005 James Hawkins
- *
- * 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 "wingdi.h"
-#include "winnls.h"
-#include "htmlhelp.h"
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "version.rc"
-
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "El.rc"
-#include "En.rc"
-#include "Fr.rc"
-#include "Fi.rc"
-#include "Hu.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
--- a/dlls/hhctrl.ocx/resource.h
+++ b/dlls/hhctrl.ocx/resource.h
@ -18,6 +18,11 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <htmlhelp.h>
+
 #define IDS_CONTENTS    1
 #define IDS_INDEX       2
 #define IDS_SEARCH      3