From 0c5f12fd390be117ca16438c6636bc738351b2dc Mon Sep 17 00:00:00 2001
From: KoffeinFlummi <koffeinflummi@gmail.com>
Date: Sun, 15 May 2016 18:21:23 +0200
Subject: [PATCH] Add optionals to Makefile, fix release building

---
 .gitignore | 18 +++++++++---------
 Makefile   | 42 ++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f38929b05..3f43985cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-release/*
-bin/*
-*.cache
-*.pbo
-texHeaders.bin
-*.swp
-*.swo
-*.biprivatekey
-Thumbs.db
+@ace/*
+*.cache
+*.pbo
+texHeaders.bin
+*.swp
+*.swo
+*.biprivatekey
+Thumbs.db
+ace3_*.zip
diff --git a/Makefile b/Makefile
index 1190158118..3d95ed9792 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
-VERSION = 3.5.1
-BIN = bin
-RELEASE = release
-SRC = addons
-CBA = ../CBA_A3
-FLAGS = -i $(CBA) -w unquoted-string
+VERSION = 3.5.1
+BIN = @ace
+CBA = tools/cba
+FLAGS = -i $(CBA) -w unquoted-string
 
-$(BIN)/ace_%.pbo: $(SRC)/%
-	@mkdir -p $(BIN)
+$(BIN)/addons/ace_%.pbo: addons/%
+	@mkdir -p $(BIN)/addons
 	@echo "  PBO  $@"
 	@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:
-	rm -rf $(BIN) $(RELEASE) extensions/build/*
+# This is a shortcut for building single addons, so you can just call "make medical.pbo"
+%.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/*/*)
 	cd extensions/build && cmake .. && make
@@ -22,13 +27,10 @@ extensions: $(wildcard extensions/*/*)
 extensions-win64: $(wildcard extensions/*/*)
 	cd extensions/build && CXX=$(eval $(which g++-w64-mingw-i686)) cmake .. && make
 
+clean:
+	rm -rf $(BIN) ace_*.zip
+
 release: all
-	@mkdir $(RELEASE) 2> /dev/null || rm -rf $(RELEASE)/*
-	@mkdir -p $(RELEASE)/@ace/addons
-	@cp $(BIN)/* $(RELEASE)/@ace/addons/
-	@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 ..
+	@echo "  ZIP  ace3_$(VERSION).zip"
+	@cp *.dll LICENSE README.md AUTHORS.txt logo_ace3_ca.paa mod.cpp meta.cpp $(BIN)
+	@zip -r ace3_$(VERSION).zip @ace &> /dev/null