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

This builds again

Browse Source
This commit is contained in:
Kayne Ruse
2015-08-18 04:01:16 +10:00
parent 13fbedb87c
commit d7aef30c9a
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common
+1 -1
Submodule common updated: 68eddcfcbb...6bcaf460b9
makefile
+1
View File
@@ -1,6 +1,7 @@
OUTDIR=out OUTDIR=out
all: $(OUTDIR) all: $(OUTDIR)
$(MAKE) -C common
$(MAKE) -C src $(MAKE) -C src
debug: export CXXFLAGS+=-g debug: export CXXFLAGS+=-g
src/makefile
+2 -4
View File
@@ -1,9 +1,9 @@
#include directories #include directories
INCLUDES+=. common libmap INCLUDES+=. ../common/graphics ../common/map
#libraries #libraries
#the order of the $(LIBS) is important, at least for MinGW #the order of the $(LIBS) is important, at least for MinGW
LIBS+=libcommon.a libmap.a LIBS+=../common/libcommon.a
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LIBS+=-lmingw32 LIBS+=-lmingw32
endif endif
@@ -33,8 +33,6 @@ OUT=$(addprefix $(OUTDIR)/,map)
#targets #targets
all: $(OBJ) $(OUT) all: $(OBJ) $(OUT)
$(MAKE) -C common
$(MAKE) -C libmap
$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
$(OBJ): | $(OBJDIR) $(OBJ): | $(OBJDIR)