Moved client scenes to a sub directory, reworked build process

client/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=../common ../common/graphics ../common/map ../common/network ../common/ui
+INCLUDES+=. scenes ../common ../common/graphics ../common/map ../common/network ../common/ui
-COMMON+=../libcommon.a
+LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
-LIB+=$(COMMON) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -20,7 +19,8 @@ OUT=$(addprefix $(OUTDIR)/,client)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
+	$(MAKE) -C scenes
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
 

client/scenes/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. .. ../../common ../../common/graphics ../../common/map ../../common/network ../../common/ui
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
+
+#output
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,libclient.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 $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/graphics/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=..
+INCLUDES+=. ..
-COMMON+=../../libcommon.a
+LIBS+=
-LIB+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/makefile

@@ -1,7 +1,8 @@
 #config
-LIB+=
+INCLUDES+=.
-CXXFLAGS+=-std=c++11 -DDEBUG
+LIBS+=
-CFLAGS+=-DDEBUG
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/map/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=.. ../graphics
+INCLUDES+=. .. ../graphics
-COMMON+=../../libcommon.a
+LIBS+=
-LIB+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/network/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=..
+INCLUDES+=. ..
-COMMON+=../../libcommon.a
+LIBS+=
-LIB+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)

common/ui/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=.. ../graphics
+INCLUDES+=. .. ../graphics
-COMMON+=../../libcommon.a
+LIBS+=
-LIB+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)

editor/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=../common ../common/graphics ../common/map ../common/network ../common/ui
+INCLUDES+=../common ../common/graphics ../common/map ../common/ui
-COMMON+=../libcommon.a
+LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL
-LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -20,7 +19,7 @@ OUT=$(addprefix $(OUTDIR)/,editor)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)
 

server/makefile

@@ -1,9 +1,8 @@
 #config
-COMMONDIR+=../common ../common/map ../common/network
+INCLUDES+=. ../common ../common/map ../common/network
-COMMON+=../libcommon.a
+LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
-LIB+=$(COMMON) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
-CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
 
 #source
 CXXSRC=$(wildcard *.cpp)
@@ -20,7 +19,7 @@ OUT=$(addprefix $(OUTDIR)/,server)
 
 #targets
 all: $(OBJ) $(OUT)
-	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB)
+	$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)
 
 $(OBJ): | $(OBJDIR)