gphoto2.ds: Build language resource files separately.

Do not include them from an other rc file.

dlls/gphoto2.ds/Makefile.in

@@ -14,7 +14,21 @@ C_SRCS = \
 	ui.c
 
 RC_SRCS = \
-	rsrc.rc
+	gphoto2_Da.rc \
+	gphoto2_De.rc \
+	gphoto2_En.rc \
+	gphoto2_Es.rc \
+	gphoto2_Fr.rc \
+	gphoto2_Ko.rc \
+	gphoto2_Lt.rc \
+	gphoto2_Nl.rc \
+	gphoto2_No.rc \
+	gphoto2_Pl.rc \
+	gphoto2_Pt.rc \
+	gphoto2_Ru.rc \
+	gphoto2_Si.rc \
+	gphoto2_Sv.rc \
+	gphoto2_Zh.rc
 
 @MAKE_DLL_RULES@
 

dlls/gphoto2.ds/gphoto2_Da.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_De.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_En.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Es.rc

@@ -18,6 +18,9 @@
  * 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 "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -55,5 +58,3 @@ BEGIN
     LTEXT           "Conectando a la cámara... Por favor espere",IDC_STATIC,128,58,
                     116,8
 END
-
-#pragma code_page(default)

dlls/gphoto2.ds/gphoto2_Fr.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Ko.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Lt.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -56,5 +58,3 @@ BEGIN
     LTEXT           "Jungiamasi prie kameros... Prašome palaukti",IDC_STATIC,124,58,
                     140,8
 END
-
-#pragma code_page(default)

dlls/gphoto2.ds/gphoto2_Nl.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_No.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Pl.rc

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Pt.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Ru.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_Si.rc

@@ -18,6 +18,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
@@ -54,5 +56,3 @@ BEGIN
     LTEXT           "Povezujem se s kamero ... Prosim, počakajte",IDC_STATIC,128,58,
                     116,8
 END
-
-#pragma code_page(default)

dlls/gphoto2.ds/gphoto2_Sv.rc

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273

dlls/gphoto2.ds/gphoto2_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)
 
@@ -92,5 +94,3 @@ BEGIN
     LTEXT           "正在連接照相機... 請稍候",IDC_STATIC,128,58,
                     116,8
 END
-
-#pragma code_page(default)

dlls/gphoto2.ds/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 <winuser.h>
+#include <commctrl.h>
+
 #define IDD_DIALOG1 					0x400
 #define IDD_CAMERAUI 					0x401
 #define IDD_CONNECTING					0x402

dlls/gphoto2.ds/rsrc.rc

@@ -1,43 +0,0 @@
-/*
- * Top level resource file for Twain
- *
- * Copyright 2006 CodeWeavers, Aric Stewart
- *
- * 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 "commctrl.h"
-
-#include "resource.h"
-
-#include "gphoto2_Da.rc"
-#include "gphoto2_De.rc"
-#include "gphoto2_En.rc"
-#include "gphoto2_Es.rc"
-#include "gphoto2_Fr.rc"
-#include "gphoto2_Ko.rc"
-#include "gphoto2_Lt.rc"
-#include "gphoto2_Nl.rc"
-#include "gphoto2_No.rc"
-#include "gphoto2_Pl.rc"
-#include "gphoto2_Pt.rc"
-#include "gphoto2_Ru.rc"
-#include "gphoto2_Si.rc"
-#include "gphoto2_Sv.rc"
-#include "gphoto2_Zh.rc"