mirror of
https://github.com/ioquake/ioq3.git
synced 2024-11-10 07:11:46 +00:00
Makefile builds fall back to traditional archiving when Mac OS X application bundle generation fails
This commit is contained in:
parent
7b9aa77c6b
commit
d9485b696e
1 changed files with 1 additions and 6 deletions
7
Makefile
7
Makefile
|
@ -1205,9 +1205,6 @@ endif
|
||||||
|
|
||||||
NAKED_TARGETS=$(shell echo $(TARGETS) | sed -e "s!$(B)/!!g")
|
NAKED_TARGETS=$(shell echo $(TARGETS) | sed -e "s!$(B)/!!g")
|
||||||
|
|
||||||
#MACOSX_TARGET_STRING=$(shell if [ "$(B)" == "$(BR)" ]; then echo "release"; elif [ "$(B)" == "$(BD)" ]; then echo "debug"; fi)
|
|
||||||
MACOSX_MAKE_APP=@if [ -x "./make-macosx-app.sh" ]; then "./make-macosx-app.sh" release $(ARCH); fi
|
|
||||||
|
|
||||||
print_list=@for i in $(1); \
|
print_list=@for i in $(1); \
|
||||||
do \
|
do \
|
||||||
echo " $$i"; \
|
echo " $$i"; \
|
||||||
|
@ -1264,9 +1261,7 @@ endif
|
||||||
$(B).zip: $(TARGETS)
|
$(B).zip: $(TARGETS)
|
||||||
ifeq ($(PLATFORM),darwin)
|
ifeq ($(PLATFORM),darwin)
|
||||||
ifdef ARCHIVE
|
ifdef ARCHIVE
|
||||||
$(call MACOSX_MAKE_APP)
|
@("./make-macosx-app.sh" release $(ARCH); if [ "$$?" -eq 0 ] && [ -d "$(B)/ioquake3.app" ]; then rm -f $@; cd $(B) && zip --symlinks -r9 ../../$@ `find "ioquake3.app" -print | sed -e "s!$(B)/!!g"`; else rm -f $@; cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS); fi)
|
||||||
@rm -f $@
|
|
||||||
@(if [ -d "$(B)/ioquake3.app" ]; then cd $(B) && zip --symlinks -r9 ../../$@ `find "ioquake3.app" -print | sed -e "s!$(B)/!!g"`; fi)
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifneq ($(PLATFORM),darwin)
|
ifneq ($(PLATFORM),darwin)
|
||||||
|
|
Loading…
Reference in a new issue