Commit f213c3dc authored by Albert Gräf's avatar Albert Gräf
Browse files

Make INCREMENTAL work on Windows (must be passed as make variable, as shell...

Make INCREMENTAL work on Windows (must be passed as make variable, as shell variable is not inherited in submakes).
parent 112a9c45
...@@ -137,7 +137,9 @@ LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc ...@@ -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 # this is for libraries that don't compile (yet) on all platforms
ifeq ($(OS_NAME),windows) ifeq ($(OS_NAME),windows)
ifneq ($(INCREMENTAL),yes)
LIB_TARGETS += gem LIB_TARGETS += gem
endif
else else
ifeq ($(OS_NAME),darwin) ifeq ($(OS_NAME),darwin)
# on Mac OS X 10.6/Snow Leopard don't build hid since it needs Carbon # on Mac OS X 10.6/Snow Leopard don't build hid since it needs Carbon
......
...@@ -315,7 +315,7 @@ then ...@@ -315,7 +315,7 @@ then
if [[ $os == "win" ]]; then if [[ $os == "win" ]]; then
echo "Making Windows package..." echo "Making Windows package..."
echo `pwd` echo `pwd`
make install && make package make install INCREMENTAL=$INCREMENTAL && make package
elif [[ $os == "osx" ]]; then elif [[ $os == "osx" ]]; then
echo "Making OSX package (dmg)..." echo "Making OSX package (dmg)..."
echo `pwd` echo `pwd`
......
...@@ -204,7 +204,7 @@ extensions_install: ...@@ -204,7 +204,7 @@ extensions_install:
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# externals_install # externals_install
externals_install: externals_install:
$(MAKE) -C $(externals_src) $(DEST_PATHS) install $(MAKE) -C $(externals_src) $(DEST_PATHS) install INCREMENTAL=$(INCREMENTAL)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
......
...@@ -62,7 +62,7 @@ install: pd_install prebuilt_install lib_install exe_install ...@@ -62,7 +62,7 @@ install: pd_install prebuilt_install lib_install exe_install
prebuilt_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 $(MAKE) -C $(packages_src) $(DEST_PATHS) doc_format
install -p pd-settings.reg $(DESTDIR)$(prefix) install -p pd-settings.reg $(DESTDIR)$(prefix)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment