Started refactoring

* Finished a basic server
* Changed from ZMQ to nanomsg (basically the same though)
* Moved some repeated code from the client/server directories into
"shared"
* Edited makefile to reflect new dependencies

1 files changed, 66 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 37c6851..a741e7d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,40 +5,64 @@ CLIENT_SRC=src/client/
 CLIENT_BUILD=build/client/
 
 SERVER_EXE=borkserver.exe
+SERVER_PATH=bin/server/bin/$(SERVER_EXE)
+SERVER_SRC=src/server/
+SERVER_BUILD=build/server/
+
+SHARED_SRC=src/shared/
+
 MASTER_EXE=borkmaster.exe
 
 CC=g++
-
+MKDIR=mkdir
 #Change this on linux
-RM=rm
+RM=rm -f
 
 #Include directories
-ILUADIR=./lib/luajit/LuaJIT-2.0.4/src
-IIRRDIR=./lib/irrlicht/irrlicht-1.8.4/irrlicht-1.8.4/include
-IBULDIR=./lib/bullet/bullet3-2.86.1/src
-INCLUDES=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR)
+ILUADIR=./lib/luajit/lua-5.1.5/src
+IIRRDIR=./lib/irrlicht/irrlicht-1.8.4/include
+IBULDIR=./lib/bullet/bullet3-2.86.1/bullet3-2.86.1/src
+INANDIR=./lib/nanomsg/nanomsg-1.0.0/src
+INCLUDES=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INANDIR) 
 #library directories
+
 LLUADIR=./lib/luajit
 LIRRDIR=./lib/irrlicht
 LBULDIR=./lib/bullet
-LIBRARIES=-L$(LLUADIR) -L$(LIRRDIR) -L$(LBULDIR)
-LIBS=-llua51 -lopengl32 -lm -lIrrlicht -llibLinearMath -llibBulletDynamics -llibBulletCollision
+LNANDIR=./lib/nanomsg
+LIBRARIES=-L$(LLUADIR) -L$(LIRRDIR) -L$(LBULDIR) -L$(LNANDIR)
+
+DYNAMIC_LIBS = -llua -lnanomsg.dll
+#order matters!
+STATIC_LIBS = -lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht
+LIBS=-Bstatic $(STATIC_LIBS) -Bdynamic $(DYNAMIC_LIBS)
+
+SLIBS=$(LBULDIR)/libBulletDynamics.a $(LBULDIR)/libBulletCollision.a $(LBULDIR)/libLinearMath.a $(LLUADIR)/liblua.a $(LIRRDIR)/libIrrlicht.a $(LNANDIR)/libnanomsg.dll.a $(LIRRDIR)/Irrlicht.dll
 
 #can't compile with -std=c++11 because irrlicht will complain
-CFLAGS=-Wall -g -Bdynamic $(INCLUDES) $(LIBRARIES)
+CFLAGS=-Wall -g $(INCLUDES) $(LIBRARIES)
 LDFLAGS=-mwindows
 
-all : $(CLIENT_PATH)
-
-$(CLIENT_PATH) : $(CLIENT_BUILD)main.o $(CLIENT_BUILD)initdevice.o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_BUILD)load_gui.o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_BUILD)load_game.o $(CLIENT_BUILD)load_core.o $(CLIENT_BUILD)load_phys.o
-	$(CC) -o $(CLIENT_PATH) $(CFLAGS) $(CLIENT_BUILD)*.o $(LIBS)
+all : $(CLIENT_PATH) $(SERVER_PATH)
 
 #Compile the client
+$(CLIENT_PATH) : $(CLIENT_BUILD)main.o $(CLIENT_BUILD)initdevice.o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_BUILD)load_gui.o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_BUILD)load_game.o $(CLIENT_BUILD)load_core.o $(CLIENT_BUILD)load_phys.o $(CLIENT_BUILD)common.o $(CLIENT_BUILD)load_net.o $(CLIENT_BUILD)physcommon.o $(SLIBS)
+	$(CC) -static -o $(CLIENT_PATH) $(CFLAGS) $(LIBS) $(CLIENT_BUILD)*.o $(SLIBS)
+
 $(CLIENT_BUILD)main.o : $(CLIENT_SRC)main.cpp
 	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)main.o $(CLIENT_SRC)main.cpp
 
+$(CLIENT_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp
+	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp
+
+$(CLIENT_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp
+	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp
+
+$(CLIENT_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h
+	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)common.o $(SHARED_SRC)lua_api/common.c
+
 $(CLIENT_BUILD)initdevice.o : $(CLIENT_SRC)initdevice.cpp $(CLIENT_SRC)initdevice.hpp
-	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)initdevice.o $(CLIENT_SRC)initdevice.cpp
+	$(CC) $(CFLAGS) -c -static -o $(CLIENT_BUILD)initdevice.o $(CLIENT_SRC)initdevice.cpp
 
 $(CLIENT_BUILD)menuhandeler.o : $(CLIENT_SRC)menuhandeler.cpp $(CLIENT_SRC)menuhandeler.hpp
 	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_SRC)menuhandeler.cpp
@@ -59,7 +83,7 @@ $(CLIENT_BUILD)load_phys.o : $(CLIENT_BUILD)bphysbox.o $(CLIENT_BUILD)bphysmodel
 	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_phys.o $(CLIENT_SRC)lua_api/load_phys.cpp
 
 $(CLIENT_BUILD)load_core.o : $(CLIENT_BUILD)icamera.o $(CLIENT_BUILD)imesh.o $(CLIENT_BUILD)bphysbox.o $(CLIENT_BUILD)ilight.o $(CLIENT_BUILD)bphysmodel.o
-	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_core.o $(CLIENT_SRC)lua_api/load_core.cpp
+	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_core.o $(CLIENT_SRC)lua_api/load_scene.cpp
 
 $(CLIENT_BUILD)ilight.o : $(CLIENT_SRC)lua_api/scene/ilight.cpp $(CLIENT_SRC)lua_api/scene/ilight.hpp
 	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)ilight.o $(CLIENT_SRC)lua_api/scene/ilight.cpp
@@ -100,6 +124,33 @@ $(CLIENT_BUILD)callbackhandeler.o : $(CLIENT_SRC)callbackhandeler.cpp $(CLIENT_S
 $(CLIENT_BUILD)hashmap.o : $(CLIENT_SRC)util/hashmap.c $(CLIENT_SRC)util/hashmap.h
 	$(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)util/hashmap.c
 
+#end compile client
+
+#compile server
+$(SERVER_PATH) : $(SERVER_BUILD)main.o $(SERVER_BUILD)hashmap.o $(SERVER_BUILD)common.o $(SERVER_BUILD)physcommon.o $(SERVER_BUILD)load_net.o
+	$(CC) -static -o $(SERVER_PATH) $(CFLAGS) $(SERVER_BUILD)*.o $(SLIBS)
+
+$(SERVER_BUILD)main.o : $(SERVER_SRC)main.cpp $(SERVER_SRC)testclient.cpp
+	$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)main.o $(SERVER_SRC)main.cpp
+
+$(SERVER_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp
+	$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp
+
+$(SERVER_BUILD)hashmap.o : $(SHARED_SRC)util/hashmap.c $(SHARED_SRC)util/hashmap.h
+	$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)hashmap.o $(SHARED_SRC)util/hashmap.c
+
+$(SERVER_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h
+	$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)common.o $(SHARED_SRC)lua_api/common.c
+
+$(SERVER_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp
+	$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp
+
+#end compile server
+
+
 
 clean :
+	$(RM) $(SERVER_PATH)
+	$(RM) $(CLIENT_PATH)
 	$(RM) $(CLIENT_BUILD)*.o
+	$(RM) $(SERVER_BUILD)*.o