From b6c93618767ba55818cdc172b407fe2cee6e73fc Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 24 Aug 2015 02:52:05 +1000 Subject: [PATCH] Added .dll files in a submodule for windows build only --- .gitmodules | 3 +++ bin | 1 + makefile | 12 +++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 160000 bin diff --git a/.gitmodules b/.gitmodules index 03c3230..7852c2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "common"] path = common url = https://github.com/Ratstail91/Tortuga.git +[submodule "bin"] + path = bin + url = https://github.com/Ratstail91/Tortuga.git diff --git a/bin b/bin new file mode 160000 index 0000000..0c98df8 --- /dev/null +++ b/bin @@ -0,0 +1 @@ +Subproject commit 0c98df8097fcc7b5350b97fe61eb8e1d3517061f diff --git a/makefile b/makefile index f824873..4765be7 100644 --- a/makefile +++ b/makefile @@ -5,8 +5,9 @@ #RM=del /S OUTDIR=out +BINDIR=bin -all: $(OUTDIR) +all: $(OUTDIR) binary $(MAKE) -C common $(MAKE) -C server $(MAKE) -C client @@ -26,16 +27,21 @@ else ifeq ($(shell uname), Linux) tar -C $(OUTDIR) -zcvf Tortuga-linux.tar client server ../rsc ../copyright.txt ../instructions.txt endif +binary: +ifeq ($(OS),Windows_NT) + copy /B /Y $(BINDIR) $(OUTDIR) +endif + $(OUTDIR): mkdir $(OUTDIR) clean: ifeq ($(OS),Windows_NT) - $(RM) *.o *.a *.exe + del /s *.o *.a *.exe $(OUTDIR)\*.dll else ifeq ($(shell uname), Linux) find . -type f -name '*.o' -exec rm -f -r -v {} \; find . -type f -name '*.a' -exec rm -f -r -v {} \; - rm -f -v $(OUT) + rm -f -v $(OUTDIR) find . -empty -type d -delete endif