kes Reapply my bat.conf install script in qt-console. I think I

[bacula/bacula] / bacula / src / win32 / Makefile.inc.in

diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in
index a3b33e597a17c9de7c43c427564d995f4b935300..052a6ed9db2796f55a0be46f1e70e41ab43785a4 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -19,17 +19,20 @@ OBJDIR := .
 
 MINGW_BIN := @BINDIR@
 MINGW_INCLUDE := @INCDIR@
+MINGW_DLLDIR := @DLLDIR@
 
 CC = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES)
 CXX = $(MINGW_BIN)/mingw32-g++ $(DEFINES) $(INCLUDES)
 AR := $(MINGW_BIN)/mingw32-ar
 RANLIB := $(MINGW_BIN)/mingw32-ranlib
 WINDRES := $(MINGW_BIN)/mingw32-windres
+DLLTOOL := $(MINGW_BIN)/../mingw32/bin/dlltool
 OBJCPY := $(MINGW_BIN)/mingw32-objcopy
 NSIS_DIR := $(DEPKGS)/nsis
+STAB2CV := $(DEPKGS)/tools/bin/stab2cv
 
-CFLAGS := -Wall -mno-cygwin -m32 -mwin32 -mthreads -O3 -fno-strict-aliasing
-LDFLAGS := -Wall -mno-cygwin -Wl,--disable-auto-import
+CFLAGS := -g -Wall -mno-cygwin -m32 -mwin32 -mthreads -O3 -fno-strict-aliasing
+LDFLAGS := -g -Wall -mno-cygwin -Wl,--disable-auto-import
 
 INCLUDE_DDK := -I$(MINGW_INCLUDE)/ddk
 INCLUDE_BACULA := -I../.. -I../compat
@@ -47,9 +50,15 @@ LIBS_PTHREADS := \
 LIBS_ZLIB := \
        $(DEPKGS)/lib/libz.a
 
-LIBS_SQL := \
+LIBS_MYSQL := \
        $(DEPKGS)/lib/libmysql.a
 
+LIBS_POSTGRESQL := \
+       $(DEPKGS)/lib/libpq.a
+
+LIBS_SQLITE := \
+       $(DEPKGS)/lib/libsqlite3.a
+
 LIBS_SSL := \
        $(DEPKGS)/lib/libssl.dll.a
 
@@ -57,8 +66,11 @@ LIBS_CRYPTO := \
        $(DEPKGS)/lib/libcrypto.dll.a
 
 LIBS_WX := \
-       $(DEPKGS)/lib/wx_dll/libwxmsw26_core.a \
-       $(DEPKGS)/lib/wx_dll/libwxbase26.a
+       $(DEPKGS)/lib/wx_dll/libwxmsw27_core.a \
+       $(DEPKGS)/lib/wx_dll/libwxbase27.a
+
+LIBS_CATS := \
+       $(LIBDIR)/libcats.a
 
 LIBS_BACULA := \
        $(LIBDIR)/libbacula.a
@@ -68,7 +80,6 @@ HAVES := \
        -DHAVE_MINGW \
        -DHAVE_ZLIB_H \
        -DHAVE_LIBZ \
-       -DHAVE_MYSQL \
        -DHAVE_CRYPTO \
        -DHAVE_OPENSSL \
        -DHAVE_TLS