-c+ECHO_CMD=@
+ECHO_CMD=@
-DIRS= dll \
+ifeq ($(WIN64),yes)
+ DIRS= lib \
+ filed \
+ filed/plugins \
+ scripts
+
+ INSTALLER=win64_installer
+
+ SPECIAL=bsmtp
+else
+ DIRS= lib \
cats \
filed \
filed/plugins \
console \
wx-console \
tools \
- scripts \
- installer
+ scripts
+
+ INSTALLER=win32_installer newinstaller
-.PHONY: $(DIRS) clean all
+ SPECIAL=
+endif
-all: Makefile.inc $(DIRS)
+.PHONY: $(DIRS) clean all Makefile.inc win32_installer newinstaller win64_installer bsmtp
-clean: $(DIRS)
+all: Makefile.inc $(DIRS) $(SPECIAL) $(INSTALLER)
+
+clean: $(DIRS) win32_installer newinstaller win64_installer
$(ECHO_CMD)-rm -rf release
+newinstaller:
+ @if test -f Makefile.inc; then \
+ if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+ echo "\n===== Make of $@ succeeded =====\n\n" ; \
+ else \
+ echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+ fi ; \
+ fi
+
+win32_installer:
+ @if test -f Makefile.inc; then \
+ if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+ echo "\n===== Make of $@ succeeded =====\n\n" ; \
+ else \
+ echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+ fi ; \
+ fi
+
+win64_installer:
+ @if test -f Makefile.inc; then \
+ if $(MAKE) -C $@ $(MAKECMDGOALS); then \
+ echo "\n===== Make of $@ succeeded =====\n\n" ; \
+ else \
+ echo "\n!!!!! Make of $@ failed !!!!!\n\n" ; \
+ fi ; \
+ fi
+
+
$(DIRS):
@if test -f Makefile.inc; then \
if $(MAKE) -C $@ $(MAKECMDGOALS); then \
fi ; \
fi
-Makefile.inc: Makefile.inc.in Makefile
+bsmtp:
+ @if test -f Makefile.inc; then \
+ if $(MAKE) -C tools bsmtp $(MAKECMDGOALS); then \
+ echo "\n===== Make of tools/bsmtp succeeded =====\n\n" ; \
+ else \
+ echo "\n!!!!! Make of tools/bsmtp failed !!!!!\n\n" ; \
+ fi ; \
+ fi
+
+Makefile.inc:
@echo Creating $@
$(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \
- if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \
+ if test "$(WIN64)" = yes -a -e $${TOPDIR}/cross-tools/mingw-w64/bin/x86_64-pc-mingw32-gcc; then \
+ BINDIR=$${TOPDIR}/cross-tools/mingw-w64/bin; \
+ INCDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/include; \
+ DLLDIR=$${TOPDIR}/cross-tools/mingw-w64/x86_64-pc-mingw32/bin; \
+ DEPKGSDIR=depkgs-mingw-w64; \
+ DEPKGSDIR32=depkgs-mingw32; \
+ elif test -e $${TOPDIR}/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; \
+ DEPKGSDIR=depkgs-mingw32; \
+ DEPKGSDIR32=depkgs-mingw32; \
else \
echo "\nThe GCC cross compiler isn't installed."; \
echo "You must run build-win32-cross-tools and build-dependencies first.\n"; \
exit 1; \
fi ; \
- $(ECHO_CMD)BUILDDIR=`(pwd)`; \
- $(ECHO_CMD)MAINDIR=`(cd ../..;pwd)`; \
+ BUILDDIR=`(pwd)`; \
+ MAINDIR=`(cd ../..;pwd)`; \
sed \
+ -e "s^@WIN64@^$${WIN64}^" \
+ -e "s^@WIN32DEPKGS@^$${DEPKGSDIR}^" \
+ -e "s^@WIN32DEPKGS32@^$${DEPKGSDIR32}^" \
-e "s^@WIN32BUILDDIR@^$${BUILDDIR}^" \
-e "s^@WIN32MAINDIR@^$${MAINDIR}^" \
-e "s^@WIN32TOPDIR@^$${TOPDIR}^" \