Add bat to Win32 build and install

diff --git a/bacula/.gitignore b/bacula/.gitignore
index 1a4780920198d6c450735ef0febef6641fb5ddd6..75b372a38c2caf7927c3e2f0e5cb6759b7e7344c 100644 (file)
--- a/bacula/.gitignore
+++ b/bacula/.gitignore
@@ -440,7 +440,10 @@ src/qt-console/moc/moc_*.cpp
 src/qt-console/mount/.*.swp
 
 # src/qt-console/obj/
-src/qt-console/obj/*.o
+src/qt-console/obj
+src/qt-console/obj32
+src/qt-console/moc32
+src/qt-console/ui32
 
 # src/qt-console/testprogs/examp/
 src/qt-console/testprogs/examp/main

diff --git a/bacula/src/qt-console/bat.pro.mingw32.in b/bacula/src/qt-console/bat.pro.mingw32.in
index 93b97cb0834c681be78a304b0a506d6175c03a42..26f5e010088afac8d72638661ce8d1553ca30835 100644 (file)
--- a/bacula/src/qt-console/bat.pro.mingw32.in
+++ b/bacula/src/qt-console/bat.pro.mingw32.in
@@ -34,9 +34,9 @@ qwt {
 }
 
 RESOURCES    = main.qrc
-MOC_DIR      = moc
-OBJECTS_DIR  = obj
-UI_DIR       = ui
+MOC_DIR      = moc32
+OBJECTS_DIR  = obj32
+UI_DIR       = ui32
 
 # Main window
 FORMS += main.ui 

diff --git a/bacula/src/qt-console/win32/qmake.conf b/bacula/src/qt-console/win32/qmake.conf
index 2d19b18e5a8b33f611a7371e6e4ed64cd16cdfd4..64d850ba0ab9016aa40b53b71136b8dae22c08d6 100644 (file)
--- a/bacula/src/qt-console/win32/qmake.conf
+++ b/bacula/src/qt-console/win32/qmake.conf
@@ -24,7 +24,7 @@ QMAKE_CFLAGS_DEPS       = -M
 QMAKE_CFLAGS_WARN_ON    = -Wall
 QMAKE_CFLAGS_WARN_OFF   = -w
 QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_DEBUG      = -g -O2
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
 
 QMAKE_CXX               = $(DEPKGS)/cross-tools/mingw32/bin/mingw32-g++