ebl update win64 doc and add paches

[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 f0dc0352e37f57381505919757a8d941096f50dc..b335ca7ecd6b28fa148a13139dd413f732402abd 100644 (file)
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -12,37 +12,48 @@
 ECHO_CMD = @
 
 # Main Bacula source dir
-MAINDIR := @MAINDIR@
+MAINDIR := @WIN32MAINDIR@
 #
 # Build dir -- i.e. normally  src/win32
-BUILDDIR := @BUILDDIR@
+BUILDDIR := @WIN32BUILDDIR@
 #
 # Dir above Bacula where we find depkgs
-TOPDIR := @TOPDIR@
+TOPDIR := @WIN32TOPDIR@
 #
 # where we find depkgs
-DEPKGS := $(TOPDIR)/depkgs-mingw32
+DEPKGS := $(TOPDIR)/@WIN32DEPKGS@
+DEPKGS32 := $(TOPDIR)/@WIN32DEPKGS32@
 
 DOCDIR := $(TOPDIR)/docs
 BINDIR := $(BUILDDIR)/release
 LIBDIR := $(BUILDDIR)/release
 OBJDIR := .
 
-MINGW_BIN := @BINDIR@
-MINGW_INCLUDE := @INCDIR@
-MINGW_DLLDIR := @DLLDIR@
+MINGW_BIN := @WIN32BINDIR@
+MINGW_INCLUDE := @WIN32INCDIR@
+MINGW_DLLDIR := @WIN32DLLDIR@
 
 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
+DLLTOOL := $(MINGW_BIN)/mingw32-dlltool
 OBJCPY := $(MINGW_BIN)/mingw32-objcopy
-NSIS_DIR := $(DEPKGS)/nsis
-STAB2CV := $(DEPKGS)/tools/bin/stab2cv
+NSIS_DIR := $(DEPKGS32)/nsis
+STAB2CV := $(DEPKGS32)/tools/bin/stab2cv
+WIN64=@WIN64@
+
+ifeq ($(WIN64),yes)
+        CFLAGS := -g -Wall -mno-cygwin -mthreads -O3 -fno-strict-aliasing -DHAVE_VSS64
+       LIBS_NETWORK := -lws2_32
+       WIN_VERSION := 64
+else
+        CFLAGS := -g -Wall -mno-cygwin -m32 -mwin32 -mthreads -O3 -fno-strict-aliasing
+       LIBS_NETWORK := -lwsock32
+       WIN_VERSION := 32
+endif
 
-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