From c808bc1aa9072e0ad92880f20a62b12ecef2b4bb Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 1 May 2009 08:26:07 +0000 Subject: [PATCH] ebl Update documentation git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8776 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/README.mingw32 | 10 +++++----- bacula/src/qt-console/bat.pro.mingw32.in | 4 ++-- bacula/src/qt-console/make-win32 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bacula/src/qt-console/README.mingw32 b/bacula/src/qt-console/README.mingw32 index 0c5484921a..cc8a75604e 100644 --- a/bacula/src/qt-console/README.mingw32 +++ b/bacula/src/qt-console/README.mingw32 @@ -50,11 +50,11 @@ $ wine qt-win-opensource-4.4.0-mingw.exe * Install under c:\Qt (no space) * no worry about mingw installation -$ cp -r ~/.wine/drive_c/Qt/4.4.0/src/ depkgs-mingw32/include -$ cp -r ~/.wine/drive_c/Qt/4.4.0/include depkgs-mingw32/include/qt -$ cp -r ~/.wine/drive_c/Qt/4.4.0/lib depkgs-mingw32/lib/qt -# copy ~/.wine/drive_c/Qt/4.4.0/bin/QtCore4.dll to src/win32/release -# copy ~/.wine/drive_c/Qt/4.4.0/bin/QtGui4.dll to src/win32/release +$ cp -r ~/.wine/drive_c/Qt/4.4.1/src/ depkgs-mingw32/include +$ cp -r ~/.wine/drive_c/Qt/4.4.1/include depkgs-mingw32/include/qt +$ cp -r ~/.wine/drive_c/Qt/4.4.1/lib depkgs-mingw32/lib/qt +# cp ~/.wine/drive_c/Qt/4.4.1/bin/QtCore4.dll src/win32/release32 +# cp ~/.wine/drive_c/Qt/4.4.1/bin/QtGui4.dll src/win32/release32 MINGW setup ----------- diff --git a/bacula/src/qt-console/bat.pro.mingw32.in b/bacula/src/qt-console/bat.pro.mingw32.in index 74f7fdafbd..68ae52bc94 100644 --- a/bacula/src/qt-console/bat.pro.mingw32.in +++ b/bacula/src/qt-console/bat.pro.mingw32.in @@ -21,7 +21,7 @@ INCLUDEPATH += .. . ./console ./restore ./select cross-win32 { # LIBS += ../win32/dll/bacula.a - LIBS += -mwindows -L../win32/release -lbacula + LIBS += -mwindows -L../win32/release32 -lbacula } !cross-win32 { LIBS += -L../lib -lbac @OPENSSL_LIBS@ @@ -69,7 +69,7 @@ SOURCES += bcomm/dircomm.cpp bcomm/dircomm_auth.cpp # Console HEADERS += console/console.h -SOURCES += console/authenticate.cpp console/console.cpp +SOURCES += console/console.cpp # Restore HEADERS += restore/restore.h diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32 index 4de01cf1b0..a0683000a3 100755 --- a/bacula/src/qt-console/make-win32 +++ b/bacula/src/qt-console/make-win32 @@ -11,6 +11,6 @@ make -j3 -f Makefile.mingw32 $1 if test -e ../config.h.orig ; then mv -f ../config.h.orig ../config.h fi -if test -d ../win32/release; then - cp -f debug/bat.exe ../win32/release +if test -d ../win32/release32; then + cp -f debug/bat.exe ../win32/release32 fi -- 2.39.5