From f213c3dc78588c60f2d8a19e16955b8d518c3666 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Thu, 8 Mar 2018 17:07:42 +0100
Subject: [PATCH] Make INCREMENTAL work on Windows (must be passed as make
 variable, as shell variable is not inherited in submakes).

---
 externals/Makefile           | 4 +++-
 l2ork_addons/tar_em_up.sh    | 2 +-
 packages/Makefile            | 2 +-
 packages/win32_inno/Makefile | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/externals/Makefile b/externals/Makefile
index e60a73c99..c2bf4caad 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -137,7 +137,9 @@ LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc
 
 # this is for libraries that don't compile (yet) on all platforms
 ifeq ($(OS_NAME),windows)
-  LIB_TARGETS += gem
+  ifneq ($(INCREMENTAL),yes)
+    LIB_TARGETS += gem
+  endif
 else
   ifeq ($(OS_NAME),darwin)
 # on Mac OS X 10.6/Snow Leopard don't build hid since it needs Carbon
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index 392baf1ed..4d13c2c9c 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -315,7 +315,7 @@ then
 	if [[ $os == "win" ]]; then
 		echo "Making Windows package..."
 		echo `pwd`
-		make install && make package
+		make install INCREMENTAL=$INCREMENTAL && make package
 	elif [[ $os == "osx" ]]; then
 		echo "Making OSX package (dmg)..."
 		echo `pwd`
diff --git a/packages/Makefile b/packages/Makefile
index e8600923c..a360dba78 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -204,7 +204,7 @@ extensions_install:
 #------------------------------------------------------------------------------
 # externals_install
 externals_install: 
-	$(MAKE) -C $(externals_src) $(DEST_PATHS) install
+	$(MAKE) -C $(externals_src) $(DEST_PATHS) install INCREMENTAL=$(INCREMENTAL)
 
 
 #------------------------------------------------------------------------------
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 611033e31..515dc161a 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -62,7 +62,7 @@ install: pd_install prebuilt_install lib_install exe_install
 
 
 prebuilt_install:
-	$(MAKE) -C $(packages_src) $(DEST_PATHS) extended_install
+	$(MAKE) -C $(packages_src) $(DEST_PATHS) extended_install INCREMENTAL=$(INCREMENTAL)
 	$(MAKE) -C $(packages_src) $(DEST_PATHS) doc_format
 	install -p pd-settings.reg $(DESTDIR)$(prefix)
 
-- 
GitLab