From 82c776df832301c6bdcdeeea3ade80a7a3680401 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 21 Jun 2014 07:00:48 +1000 Subject: [PATCH] Moved the generators into a subdirectory --- server/makefile | 2 +- .../{ => generators}/base_generator.cpp | 0 .../{ => generators}/base_generator.hpp | 0 .../{ => generators}/caves_generator.cpp | 0 .../{ => generators}/caves_generator.hpp | 0 .../{ => generators}/forests_generator.cpp | 0 .../{ => generators}/forests_generator.hpp | 0 server/mapgen/generators/makefile | 37 +++++++++++++++++++ .../{ => generators}/overworld_generator.cpp | 0 .../{ => generators}/overworld_generator.hpp | 0 .../{ => generators}/ruins_generator.cpp | 0 .../{ => generators}/ruins_generator.hpp | 0 .../{ => generators}/towers_generator.cpp | 0 .../{ => generators}/towers_generator.hpp | 0 server/mapgen/makefile | 1 + server/rooms/makefile | 2 +- 16 files changed, 40 insertions(+), 2 deletions(-) rename server/mapgen/{ => generators}/base_generator.cpp (100%) rename server/mapgen/{ => generators}/base_generator.hpp (100%) rename server/mapgen/{ => generators}/caves_generator.cpp (100%) rename server/mapgen/{ => generators}/caves_generator.hpp (100%) rename server/mapgen/{ => generators}/forests_generator.cpp (100%) rename server/mapgen/{ => generators}/forests_generator.hpp (100%) create mode 100644 server/mapgen/generators/makefile rename server/mapgen/{ => generators}/overworld_generator.cpp (100%) rename server/mapgen/{ => generators}/overworld_generator.hpp (100%) rename server/mapgen/{ => generators}/ruins_generator.cpp (100%) rename server/mapgen/{ => generators}/ruins_generator.hpp (100%) rename server/mapgen/{ => generators}/towers_generator.cpp (100%) rename server/mapgen/{ => generators}/towers_generator.hpp (100%) diff --git a/server/makefile b/server/makefile index d596f04..642dec3 100644 --- a/server/makefile +++ b/server/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. accounts characters combat enemies mapgen rooms ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities +INCLUDES+=. accounts characters combat enemies mapgen mapgen/generators rooms ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/mapgen/base_generator.cpp b/server/mapgen/generators/base_generator.cpp similarity index 100% rename from server/mapgen/base_generator.cpp rename to server/mapgen/generators/base_generator.cpp diff --git a/server/mapgen/base_generator.hpp b/server/mapgen/generators/base_generator.hpp similarity index 100% rename from server/mapgen/base_generator.hpp rename to server/mapgen/generators/base_generator.hpp diff --git a/server/mapgen/caves_generator.cpp b/server/mapgen/generators/caves_generator.cpp similarity index 100% rename from server/mapgen/caves_generator.cpp rename to server/mapgen/generators/caves_generator.cpp diff --git a/server/mapgen/caves_generator.hpp b/server/mapgen/generators/caves_generator.hpp similarity index 100% rename from server/mapgen/caves_generator.hpp rename to server/mapgen/generators/caves_generator.hpp diff --git a/server/mapgen/forests_generator.cpp b/server/mapgen/generators/forests_generator.cpp similarity index 100% rename from server/mapgen/forests_generator.cpp rename to server/mapgen/generators/forests_generator.cpp diff --git a/server/mapgen/forests_generator.hpp b/server/mapgen/generators/forests_generator.hpp similarity index 100% rename from server/mapgen/forests_generator.hpp rename to server/mapgen/generators/forests_generator.hpp diff --git a/server/mapgen/generators/makefile b/server/mapgen/generators/makefile new file mode 100644 index 0000000..3e4ed5b --- /dev/null +++ b/server/mapgen/generators/makefile @@ -0,0 +1,37 @@ +#config +INCLUDES+=. .. +LIBS+= +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) + +#source +CXXSRC=$(wildcard *.cpp) + +#objects +OBJDIR=obj +OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) + +#output +OUTDIR=../.. +OUT=$(addprefix $(OUTDIR)/,server.a) + +#targets +all: $(OBJ) $(OUT) + ar -crs $(OUT) $(OBJ) + +$(OBJ): | $(OBJDIR) + +$(OUT): | $(OUTDIR) + +$(OBJDIR): + mkdir $(OBJDIR) + +$(OUTDIR): + mkdir $(OUTDIR) + +$(OBJDIR)/%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< + +clean: + $(RM) *.o *.a *.exe + +rebuild: clean all diff --git a/server/mapgen/overworld_generator.cpp b/server/mapgen/generators/overworld_generator.cpp similarity index 100% rename from server/mapgen/overworld_generator.cpp rename to server/mapgen/generators/overworld_generator.cpp diff --git a/server/mapgen/overworld_generator.hpp b/server/mapgen/generators/overworld_generator.hpp similarity index 100% rename from server/mapgen/overworld_generator.hpp rename to server/mapgen/generators/overworld_generator.hpp diff --git a/server/mapgen/ruins_generator.cpp b/server/mapgen/generators/ruins_generator.cpp similarity index 100% rename from server/mapgen/ruins_generator.cpp rename to server/mapgen/generators/ruins_generator.cpp diff --git a/server/mapgen/ruins_generator.hpp b/server/mapgen/generators/ruins_generator.hpp similarity index 100% rename from server/mapgen/ruins_generator.hpp rename to server/mapgen/generators/ruins_generator.hpp diff --git a/server/mapgen/towers_generator.cpp b/server/mapgen/generators/towers_generator.cpp similarity index 100% rename from server/mapgen/towers_generator.cpp rename to server/mapgen/generators/towers_generator.cpp diff --git a/server/mapgen/towers_generator.hpp b/server/mapgen/generators/towers_generator.hpp similarity index 100% rename from server/mapgen/towers_generator.hpp rename to server/mapgen/generators/towers_generator.hpp diff --git a/server/mapgen/makefile b/server/mapgen/makefile index 8d12afe..d949a54 100644 --- a/server/mapgen/makefile +++ b/server/mapgen/makefile @@ -17,6 +17,7 @@ OUT=$(addprefix $(OUTDIR)/,server.a) #targets all: $(OBJ) $(OUT) ar -crs $(OUT) $(OBJ) + $(MAKE) -C generators $(OBJ): | $(OBJDIR) diff --git a/server/rooms/makefile b/server/rooms/makefile index 1316fb4..f4921ea 100644 --- a/server/rooms/makefile +++ b/server/rooms/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../mapgen ../../common/map +INCLUDES+=. ../mapgen ../mapgen/generators ../../common/map LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))