From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 13 Jan 2011 19:14:32 +0000 (+0100)
Subject: Fix build of Windows bat -- Qt depends on libgcc_s_dw2-1.dll
X-Git-Tag: Release-5.2.1~735
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=05113fbf03b1625da22ad9e92a6d3574410c131c;p=bacula%2Fbacula

Fix build of Windows bat -- Qt depends on libgcc_s_dw2-1.dll
---

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 188d17f5e9..1004c67b80 100644
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -47,7 +47,8 @@ DEPKGS_BINARIES := \
 	mkisofs.exe \
 	growisofs.exe \
 	QtCore4.dll \
-	QtGui4.dll
+	QtGui4.dll \
+	libgcc_s_dw2-1.dll
 
 NONGCC_BINARIES :=
 
diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 2e0d668df7..49da832148 100644
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -503,6 +503,7 @@ Section "Bat Console" SecBatConsole
   Call InstallCommonFiles
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
+  File "${SRC_DIR}\libgcc_s_dw2-1.dll"
 
   File "${SRC_DIR}\bat.exe"
 
diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index 8ae15e0823..eddc9a8273 100644
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -159,6 +159,7 @@ $(INSTALL_EXE): winbacula.nsi $(addprefix release64/,$(BACULA_BINARIES) $(DEPKGS
 	cp -f ../release32/bat.exe release64
 	cp -f ../release32/QtCore4.dll release64
 	cp -f ../release32/QtGui4.dll release64
+	cp -f ../win32_installer/release32/libgcc_s_dw2-1.dll release64
 	cp -f ../win32_installer/release32/mingwm10.dll release64
 	cp -f ../win32_installer/release32/ssleay32.dll release64
 	cp -f ../win32_installer/release32/libeay32.dll release64
diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index 27a0915aed..59b5a15c93 100644
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -509,6 +509,7 @@ Section "Bat Console" SecBatConsole
   Call InstallCommonFiles
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
+  File "${SRC_DIR}\libgcc_s_dw2-1.dll"
   File "${SRC_DIR}\mingwm10.dll"
   File "${SRC_DIR}\ssleay32.dll"
   File "${SRC_DIR}\libeay32.dll"