Add optionals to Makefile, fix release building

This commit is contained in:
KoffeinFlummi 2016-05-15 18:21:23 +02:00
parent ee71ebe596
commit 0c5f12fd39
2 changed files with 31 additions and 29 deletions

18
.gitignore vendored
View File

@ -1,9 +1,9 @@
release/* @ace/*
bin/* *.cache
*.cache *.pbo
*.pbo texHeaders.bin
texHeaders.bin *.swp
*.swp *.swo
*.swo *.biprivatekey
*.biprivatekey Thumbs.db
Thumbs.db ace3_*.zip

View File

@ -1,19 +1,24 @@
VERSION = 3.5.1 VERSION = 3.5.1
BIN = bin BIN = @ace
RELEASE = release CBA = tools/cba
SRC = addons FLAGS = -i $(CBA) -w unquoted-string
CBA = ../CBA_A3
FLAGS = -i $(CBA) -w unquoted-string
$(BIN)/ace_%.pbo: $(SRC)/% $(BIN)/addons/ace_%.pbo: addons/%
@mkdir -p $(BIN) @mkdir -p $(BIN)/addons
@echo " PBO $@" @echo " PBO $@"
@armake build ${FLAGS} -f $< $@ @armake build ${FLAGS} -f $< $@
all: $(patsubst $(SRC)/%, $(BIN)/ace_%.pbo, $(wildcard $(SRC)/*)) $(BIN)/optionals/ace_%.pbo: optionals/%
@mkdir -p $(BIN)/optionals
@echo " PBO $@"
@armake build ${FLAGS} -f $< $@
clean: # This is a shortcut for building single addons, so you can just call "make medical.pbo"
rm -rf $(BIN) $(RELEASE) extensions/build/* %.pbo:
make $(patsubst %, $(BIN)/addons/ace_%, $@)
all: $(patsubst addons/%, $(BIN)/addons/ace_%.pbo, $(wildcard addons/*)) \
$(patsubst optionals/%, $(BIN)/optionals/ace_%.pbo, $(wildcard optionals/*))
extensions: $(wildcard extensions/*/*) extensions: $(wildcard extensions/*/*)
cd extensions/build && cmake .. && make cd extensions/build && cmake .. && make
@ -22,13 +27,10 @@ extensions: $(wildcard extensions/*/*)
extensions-win64: $(wildcard extensions/*/*) extensions-win64: $(wildcard extensions/*/*)
cd extensions/build && CXX=$(eval $(which g++-w64-mingw-i686)) cmake .. && make cd extensions/build && CXX=$(eval $(which g++-w64-mingw-i686)) cmake .. && make
clean:
rm -rf $(BIN) ace_*.zip
release: all release: all
@mkdir $(RELEASE) 2> /dev/null || rm -rf $(RELEASE)/* @echo " ZIP ace3_$(VERSION).zip"
@mkdir -p $(RELEASE)/@ace/addons @cp *.dll LICENSE README.md AUTHORS.txt logo_ace3_ca.paa mod.cpp meta.cpp $(BIN)
@cp $(BIN)/* $(RELEASE)/@ace/addons/ @zip -r ace3_$(VERSION).zip @ace &> /dev/null
@cp *.dll $(RELEASE)/@ace/
@cp *.cpp $(RELEASE)/@ace/
@cp logo_ace3_ca.paa README.md LICENSE $(RELEASE)/@ace/
@cp docs/* $(RELEASE)/@ace/
@echo " ZIP $(RELEASE)/ace3_$(VERSION).zip"
@cd $(RELEASE); zip -r ace3_$(VERSION).zip @ace &> /dev/null; cd ..