From d7aef30c9a427150fa035b86568d33cd467a379d Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Tue, 18 Aug 2015 04:01:16 +1000 Subject: [PATCH] This builds again --- common | 2 +- makefile | 1 + src/makefile | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common b/common index 68eddcf..6bcaf46 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 68eddcfcbb94171212fa7702b411aa28ff3454eb +Subproject commit 6bcaf460b95d3da258545140b8c82fc508cb658b diff --git a/makefile b/makefile index 2390ca8..d48bf82 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,7 @@ OUTDIR=out all: $(OUTDIR) + $(MAKE) -C common $(MAKE) -C src debug: export CXXFLAGS+=-g diff --git a/src/makefile b/src/makefile index 5f3b65f..4f4be4a 100644 --- a/src/makefile +++ b/src/makefile @@ -1,9 +1,9 @@ #include directories -INCLUDES+=. common libmap +INCLUDES+=. ../common/graphics ../common/map #libraries #the order of the $(LIBS) is important, at least for MinGW -LIBS+=libcommon.a libmap.a +LIBS+=../common/libcommon.a ifeq ($(OS),Windows_NT) LIBS+=-lmingw32 endif @@ -33,8 +33,6 @@ OUT=$(addprefix $(OUTDIR)/,map) #targets all: $(OBJ) $(OUT) - $(MAKE) -C common - $(MAKE) -C libmap $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) $(OBJ): | $(OBJDIR)