diff --git a/externals/Makefile b/externals/Makefile index e60a73c990d0b1ea8c67d95289f2d3724ecfb8d6..c2bf4caad64ed740c5dae7c7573e9756087ad2fe 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 392baf1edac4128dc04930dcad1a4ffa6bc1a441..4d13c2c9c695252b4560ba5ec8908b85d00eee67 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 e8600923cff28fcfbc5f21fd8dcfb96bd0396905..a360dba78c28e30c1d5089bfd6d4626d00c4fdde 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 611033e3145eda30f76c97ca4baa25834d183968..515dc161af572c85380fa54b24797f274b747a41 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)