Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added .dll files in a submodule for windows build only

Browse Source
This commit is contained in:
Kayne Ruse
2015-08-24 02:52:05 +10:00
parent 45f67476b8
commit b6c9361876
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -1,3 +1,6 @@
[submodule "common"] [submodule "common"]
path = common path = common
url = https://github.com/Ratstail91/Tortuga.git url = https://github.com/Ratstail91/Tortuga.git
[submodule "bin"]
path = bin
url = https://github.com/Ratstail91/Tortuga.git
bin
Submodule
+1
Submodule bin added at 0c98df8097
makefile
+9 -3
View File
@@ -5,8 +5,9 @@
#RM=del /S #RM=del /S
OUTDIR=out OUTDIR=out
BINDIR=bin
all: $(OUTDIR) all: $(OUTDIR) binary
$(MAKE) -C common $(MAKE) -C common
$(MAKE) -C server $(MAKE) -C server
$(MAKE) -C client $(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 tar -C $(OUTDIR) -zcvf Tortuga-linux.tar client server ../rsc ../copyright.txt ../instructions.txt
endif endif
binary:
ifeq ($(OS),Windows_NT)
copy /B /Y $(BINDIR) $(OUTDIR)
endif
$(OUTDIR): $(OUTDIR):
mkdir $(OUTDIR) mkdir $(OUTDIR)
clean: clean:
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
$(RM) *.o *.a *.exe del /s *.o *.a *.exe $(OUTDIR)\*.dll
else ifeq ($(shell uname), Linux) else ifeq ($(shell uname), Linux)
find . -type f -name '*.o' -exec rm -f -r -v {} \; find . -type f -name '*.o' -exec rm -f -r -v {} \;
find . -type f -name '*.a' -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 find . -empty -type d -delete
endif endif