From 1e56e5793d22973921d8c6966cf068b8f4a8a843 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 25 Nov 2011 08:52:09 +0100 Subject: [PATCH] Fix Win32 tray-monitor build --- bacula/src/qt-console/bat.pro.mingw32.in | 2 +- bacula/src/qt-console/make-win32 | 4 +++- bacula/src/qt-console/tray-monitor/tray-monitor.pro.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bacula/src/qt-console/bat.pro.mingw32.in b/bacula/src/qt-console/bat.pro.mingw32.in index dbf3236c5b..1f2c71d70b 100644 --- a/bacula/src/qt-console/bat.pro.mingw32.in +++ b/bacula/src/qt-console/bat.pro.mingw32.in @@ -2,7 +2,7 @@ # # !!!!!!! IMPORTANT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # -# Edit only bat.pro.miingw32.in -- bat.pro.mingw32 is built by the ./configure program +# Edit only bat.pro.mingw32.in -- bat.pro.mingw32 is built by the ./configure program # # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32 index 5b1bab2e6e..295023ec31 100755 --- a/bacula/src/qt-console/make-win32 +++ b/bacula/src/qt-console/make-win32 @@ -1,11 +1,12 @@ #!/bin/sh # -# Used to build the Win32 version of bat +# Used to build the Windows version of bat and the tray-monitor # rm -f debug/bat.exe if test -f ../config.h ; then mv -f ../config.h ../config.h.orig fi +# Create bat Makefile.mingw32 qmake -spec win32 -unix -o Makefile.mingw32 bat.pro.mingw32 echo "Make Windows bat" make -j3 -f Makefile.mingw32 $1 @@ -29,6 +30,7 @@ fi cd tray-monitor rm -f release/bacula-tray-monitor.exe debug/bacula-tray-monitor.exe +# Create tray-monitor Makefile.mingw32 qmake -spec ../win32 -unix -o Makefile.mingw32 tray-monitor.pro echo "Make Windows tray-monitor" make -j3 -f Makefile.mingw32 $1 diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in index 19863c29b6..3ae813a00c 100644 --- a/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in +++ b/bacula/src/qt-console/tray-monitor/tray-monitor.pro.in @@ -6,7 +6,8 @@ # # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # -CONFIG += qt +CONFIG += qt cross-win32 +#CONFIG += qt debug cross-win32 { LIBS += -mwindows -L../../win32/release32 -lbacula -- 2.39.5