okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source 
Conflicts:
	code/sdl/sdl_input.c
This commit is contained in:
Tim Angus 2013-08-16 23:34:08 +01:00
commit bde7665462
97 changed files with 6333 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1259,9 +1259,16 @@ ifneq ($(TARGETS),)
endif
$(B).zip: $(TARGETS)
ifdef ARCHIVE
ifeq ($(PLATFORM),darwin)
ifdef ARCHIVE
@("./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)
endif
endif
ifneq ($(PLATFORM),darwin)
ifdef ARCHIVE
@rm -f $@
@(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
endif
endif
makedirs: