Moved the generators into a subdirectory

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))
 

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

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)
 

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))