From a47e76845f7e378a52cf3fc79c7ea95823da9faa Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 26 May 2014 02:21:56 +1000 Subject: [PATCH] Removed common/ from the build process, and the DEBUG flag The common/ directory is empty, only containing more directories to be built, and the DEBUG flag isn't being used. --- client/makefile | 4 ++-- client/scenes/makefile | 4 ++-- common/gameplay/makefile | 4 ++-- common/graphics/makefile | 4 ++-- common/makefile | 33 +-------------------------------- common/map/makefile | 4 ++-- common/network/makefile | 4 ++-- common/script/makefile | 4 ++-- common/ui/makefile | 4 ++-- common/utilities/makefile | 4 ++-- server/makefile | 4 ++-- 11 files changed, 21 insertions(+), 52 deletions(-) diff --git a/client/makefile b/client/makefile index e9c2091..f049556 100644 --- a/client/makefile +++ b/client/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. scenes ../common ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities +INCLUDES+=. scenes ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/client/scenes/makefile b/client/scenes/makefile index b436dff..d09de2e 100644 --- a/client/scenes/makefile +++ b/client/scenes/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../../common ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities +INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/gameplay/makefile b/common/gameplay/makefile index e86cb16..9013447 100644 --- a/common/gameplay/makefile +++ b/common/gameplay/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. +INCLUDES+=. LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/graphics/makefile b/common/graphics/makefile index 343f0f1..afcde11 100644 --- a/common/graphics/makefile +++ b/common/graphics/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../map +INCLUDES+=. ../map LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/makefile b/common/makefile index 3acd152..0e48688 100644 --- a/common/makefile +++ b/common/makefile @@ -1,22 +1,4 @@ -#config -INCLUDES+=. .. -LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) - -#source -CXXSRC=$(wildcard *.cpp) - -#objects -OBJDIR=obj -OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) - -#output -OUTDIR=../.. -OUT=$(addprefix $(OUTDIR)/,libcommon.a) - -#targets -all: $(OBJ) $(OUT) - ar -crs $(OUT) $(OBJ) +all: $(MAKE) -C gameplay $(MAKE) -C graphics $(MAKE) -C map @@ -25,19 +7,6 @@ all: $(OBJ) $(OUT) $(MAKE) -C ui $(MAKE) -C utilities -$(OBJ): | $(OBJDIR) - -$(OUT): | $(OUTDIR) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OUTDIR): - mkdir $(OUTDIR) - -$(OBJDIR)/%.o: %.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< - clean: $(RM) *.o *.a *.exe diff --git a/common/map/makefile b/common/map/makefile index 1f25da1..769709e 100644 --- a/common/map/makefile +++ b/common/map/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../utilities +INCLUDES+=. ../utilities LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/network/makefile b/common/network/makefile index b5ac556..7053c0f 100644 --- a/common/network/makefile +++ b/common/network/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../gameplay ../map ../utilities +INCLUDES+=. ../gameplay ../map ../utilities LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/script/makefile b/common/script/makefile index 7f9288d..7cab524 100644 --- a/common/script/makefile +++ b/common/script/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../map ../utilities +INCLUDES+=. ../map ../utilities LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/ui/makefile b/common/ui/makefile index 95166fd..bd9ffd1 100644 --- a/common/ui/makefile +++ b/common/ui/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. ../graphics +INCLUDES+=. ../graphics LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/common/utilities/makefile b/common/utilities/makefile index e86cb16..9013447 100644 --- a/common/utilities/makefile +++ b/common/utilities/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. .. +INCLUDES+=. LIBS+= -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp) diff --git a/server/makefile b/server/makefile index 5bfd158..901f8a6 100644 --- a/server/makefile +++ b/server/makefile @@ -1,7 +1,7 @@ #config -INCLUDES+=. ../common ../common/gameplay ../common/map ../common/network ../common/script ../common/utilities +INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/script ../common/utilities LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3 -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) #source CXXSRC=$(wildcard *.cpp)