From eff22a3371632c91a5a02ffa0cd07de59fca1218 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 1 Nov 2009 23:19:04 +0100 Subject: [PATCH] Add bat to Win32 build and install --- bacula/.gitignore | 5 ++++- bacula/src/qt-console/bat.pro.mingw32.in | 6 +++--- bacula/src/qt-console/win32/qmake.conf | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bacula/.gitignore b/bacula/.gitignore index 1a47809201..75b372a38c 100644 --- 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 93b97cb083..26f5e01008 100644 --- 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 2d19b18e5a..64d850ba0a 100644 --- 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++ -- 2.39.5