Merge
This commit is contained in:
commit
e169427eaa
@ -64,19 +64,17 @@ ifneq ($(JQS), off)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(KERNEL), off)
|
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
ifeq ($(PLATFORM), windows)
|
||||||
ifeq ($(PLATFORM), windows)
|
# Only set up to use UPX compression if it is available
|
||||||
# Only set up to use UPX compression if it is available
|
UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
|
||||||
UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
|
$(ECHO) true ; \
|
||||||
$(ECHO) true ; \
|
else \
|
||||||
else \
|
$(ECHO) false ; \
|
||||||
$(ECHO) false ; \
|
fi )
|
||||||
fi )
|
ifeq ($(UP_TMP), true)
|
||||||
ifeq ($(UP_TMP), true)
|
DEPLOY_BUILD_TARGETS += cmd-comp-all
|
||||||
DEPLOY_BUILD_TARGETS += cmd-comp-all
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user