Add MinGW changes missed from the previous commit.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3723 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile
index 0eaaaec62c157f443e9d06ae976dda21f788cfc9..56e8d3198ddded63f4608b374a44bf7c439f6f76 100644 (file)
--- a/bacula/src/win32/Makefile
+++ b/bacula/src/win32/Makefile
@@ -33,9 +33,11 @@ Makefile.inc: Makefile.inc.in
        if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \
                BINDIR=$${TOPDIR}/cross-tools/mingw32/bin; \
                INCDIR=$${TOPDIR}/cross-tools/mingw32/mingw32/include; \
+               DLLDIR=$${TOPDIR}/cross-tools/mingw32/mingw32/bin; \
        elif test -e /mingw/bin/mingw32-gcc; then \
                BINDIR=/mingw/bin; \
                INCDIR=/mingw/include; \
+               DLLDIR=/mingw/bin; \
        else \
                echo -e "\nThe GCC cross compiler isn't installed."; \
                echo -e "You must run build-win32-cross-tools and build-dependencies first.\n"; \
@@ -43,4 +45,5 @@ Makefile.inc: Makefile.inc.in
        fi ; \
        sed -e "s^@TOPDIR@^$${TOPDIR}^" \
                -e "s^@BINDIR@^$${BINDIR}^" \
-               -e "s^@INCDIR@^$${INCDIR}^" < Makefile.inc.in > $@
+               -e "s^@INCDIR@^$${INCDIR}^" \
+               -e "s^@DLLDIR@^$${DLLDIR}^" < Makefile.inc.in > $@

diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in
index ef2b7e211c7d228482bdad3b84129ea42ef251c6..7e57340e0f738b8c11c2515e796450bb049c19d2 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -19,6 +19,7 @@ OBJDIR := .
 
 MINGW_BIN := @BINDIR@
 MINGW_INCLUDE := @INCDIR@
+MINGW_DLLDIR := @DLLDIR@
 
 CC = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES)
 CXX = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES)
@@ -55,6 +56,9 @@ LIBS_MYSQL := \
 LIBS_POSTGRESQL := \
        $(DEPKGS)/lib/libpq.a
 
+LIBS_SQLITE := \
+       $(DEPKGS)/lib/libsqlite3.a
+
 LIBS_SSL := \
        $(DEPKGS)/lib/libssl.dll.a