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 188d17f5e9c33109fb8a4939f627f18fc04f3562..1004c67b803fbef7aba8815b68f7bb935db3e83f 100644 (file)
--- 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 2e0d668df77e119a0d4380a4781685779ff718e5..49da832148da0cd321679d533f21dcf51c4c7b1b 100644 (file)
--- 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 8ae15e0823ffa98ca2056af733fda6d2b82469c7..eddc9a8273b414a843b6edc511129b0a1c4f2728 100644 (file)
--- 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 27a0915aed120697c9b77d19729228c9c103f062..59b5a15c93c52573ed82b1eab4d6c7f9810d04ee 100644 (file)
--- 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"