Moved the common directory into the libs directory

README.md

@@ -5,8 +5,8 @@ Tortuga is a 3/4 top down multiplayer RPG set in a large archipelago occupied by
 ## Libraries
 
 * [SDL](http://www.libsdl.org/) - Simple DirectMedia Layer API
-* [SDL_net](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension, modified; libs/SDL_net
+* [SDL_net](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension, slightly modified. This must be installed first.
-* [Codebase](https://github.com/Ratstail91/Codebase) - generic reusable code modules; libs/Codebase
+* [Codebase](https://github.com/Ratstail91/Codebase) - generic reusable code modules
 
 ## Instructions
 

client/makefile

@@ -1,8 +1,8 @@
 #config
 LIBDIR=../libs
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
 LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
-INCLUDES=$(LIBDIR)/Codebase ../common
+INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source

libs/Codebase/makefile

@@ -1,7 +1,9 @@
 #config
+LIBDIR=..
+LOCALLIBS=
+LIB=
 INCLUDES=
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
-LIB=
 
 #source
 SRC=$(wildcard *.cpp)

libs/SDL_net/makefile

@@ -1,7 +1,9 @@
 #config
+LIBDIR=..
+LOCALLIBS=
+LIB=
 INCLUDES=
 CFLAGS+=$(addprefix -I,$(INCLUDES))
-LIB=
 
 #source
 SRC=$(wildcard *.c)

libs/common/makefile

@@ -0,0 +1,39 @@
+#config
+LIBDIR=..
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a
+LIB=
+INCLUDES=$(LIBDIR)/Codebase
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+SRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o))
+
+#output
+OUTDIR=../out
+OUT=$(addprefix $(OUTDIR)/,libCommon.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

libs/common/network_queue.cpp

@@ -0,0 +1,15 @@
+#include "network_queue.hpp"
+
+#include "SDL/SDL_thread.h"
+
+#include <deque>
+
+static std::deque<Packet> queue;
+
+int networkQueue(void*) {
+	//
+}
+
+Packet getPacket() {
+	//
+}

libs/common/network_queue.hpp

@@ -0,0 +1,9 @@
+#ifndef NETWORKQUEUE_HPP_
+#define NETWORKQUEUE_HPP_
+
+#include "packet_type.hpp"
+
+int networkQueue(void*);
+Packet getPacket();
+
+#endif

libs/makefile

@@ -3,6 +3,7 @@ OUTDIR=out
 all: $(OUTDIR)
 	$(MAKE) -C SDL_net
 	$(MAKE) -C codebase
+	$(MAKE) -C common
 
 $(OUTDIR):
 	mkdir $(OUTDIR)

server/makefile

@@ -1,8 +1,8 @@
 #config
 LIBDIR=../libs
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
 LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
-INCLUDES=$(LIBDIR)/Codebase ../common
+INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source

test/makefile

@@ -1,7 +1,8 @@
 #config
 LIBDIR=../libs
-LIB=-lmingw32 -lSDLmain -lSDL $(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libSDL_net.a
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
-INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/SDL_net ../common
+LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
+INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source