mpr: Build language resource files separately.

Instead of including them from an other rc file.

dlls/mpr/Makefile.in

@@ -14,7 +14,31 @@ C_SRCS = \
 	pwcache.c \
 	wnet.c
 
-RC_SRCS = mpr.rc
+RC_SRCS = \
+	mpr_Bg.rc \
+	mpr_Cs.rc \
+	mpr_Da.rc \
+	mpr_De.rc \
+	mpr_En.rc \
+	mpr_Eo.rc \
+	mpr_Es.rc \
+	mpr_Fr.rc \
+	mpr_Hu.rc \
+	mpr_It.rc \
+	mpr_Ja.rc \
+	mpr_Ko.rc \
+	mpr_Lt.rc \
+	mpr_Nl.rc \
+	mpr_No.rc \
+	mpr_Pl.rc \
+	mpr_Pt.rc \
+	mpr_Ro.rc \
+	mpr_Ru.rc \
+	mpr_Si.rc \
+	mpr_Sv.rc \
+	mpr_Tr.rc \
+	mpr_Zh.rc \
+	version.rc
 
 @MAKE_DLL_RULES@
 

dlls/mpr/mpr.rc

@@ -1,49 +0,0 @@
-/*
- * MPR dll resources
- *
- * Copyright (C) 2004 Juan Lang
- *
- * 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 "mprres.h"
-
-#include "version.rc"
-
-#include "mpr_Bg.rc"
-#include "mpr_Cs.rc"
-#include "mpr_Da.rc"
-#include "mpr_De.rc"
-#include "mpr_En.rc"
-#include "mpr_Eo.rc"
-#include "mpr_Es.rc"
-#include "mpr_Fr.rc"
-#include "mpr_Hu.rc"
-#include "mpr_It.rc"
-#include "mpr_Ja.rc"
-#include "mpr_Ko.rc"
-#include "mpr_Lt.rc"
-#include "mpr_Nl.rc"
-#include "mpr_No.rc"
-#include "mpr_Pl.rc"
-#include "mpr_Pt.rc"
-#include "mpr_Ro.rc"
-#include "mpr_Ru.rc"
-#include "mpr_Si.rc"
-#include "mpr_Sv.rc"
-#include "mpr_Tr.rc"
-#include "mpr_Zh.rc"

dlls/mpr/mpr_Bg.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Cs.rc

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

dlls/mpr/mpr_Da.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_De.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_En.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Eo.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Es.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Fr.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Hu.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_It.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Ja.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE
 {
     IDS_ENTIRENETWORK "ネットワーク全体"
 }
-
-#pragma code_page(default)

dlls/mpr/mpr_Ko.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Lt.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -47,5 +49,3 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/mpr/mpr_Nl.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_No.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Pl.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Pt.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Ro.rc

@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -44,5 +46,3 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
     PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/mpr/mpr_Ru.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Si.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -46,5 +48,3 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/mpr/mpr_Sv.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Tr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE

dlls/mpr/mpr_Zh.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -74,5 +76,3 @@ FONT 9, "MS Shell Dlg"
  PUSHBUTTON "確定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

dlls/mpr/mprres.h

@@ -18,6 +18,9 @@
 #ifndef __WINE_MPRRES_H__
 #define __WINE_MPRRES_H__
 
+#include <windef.h>
+#include <winuser.h>
+
 #define IDS_ENTIRENETWORK 1
 
 #define IDD_PROXYDLG     0x400