Updated makefile to support new code

1 files changed, 14 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index bc55bc2..e9ae94b 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ LOBJDIR=$(LIB_DIR)/tinyobjloader-c
 ILUADIR=$(LLUADIR)/src
 IIRRDIR=$(LIRRDIR)/include
 IBULDIR=$(LBULDIR)/src
-INNGDIR=$(LNNGDIR)/src
+INNGDIR=$(LNNGDIR)/include
 IOBJDIR=$(LOBJDIR)/
 ISHADIR=src
 INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INNGDIR) -I$(ISHADIR) -I$(IOBJDIR)
@@ -156,12 +156,12 @@ SHARED_CLIENT_FILES = $(LAPI_PATHS_T) phys/physcommon util/hashmap util/tinyobj
 SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o)
 
 # The client-side only stuff
-LAPI_C_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector iguifiledialog iguispinbox iguitreeview
+LAPI_C_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector iguifiledialog iguispinbox iguitreeview iguicombobox
 LAPI_C_PHYS = cbphysbox cbphysmodel
 LAPI_C_SCENE = icamera igeneric ilight imesh
 LAPI_C_VIDEO = iimage itexture smaterial
 LAPI_C_IO = ifilesystem
-LAPI_LOAD = load_gui load_game load_scene load_cphys load_video load_io
+LAPI_LOAD = load_gui load_scene load_game load_cphys load_video load_io
 LAPI_OBJS_T = $(LAPI_C_GUI:%=gui/%.o) $(LAPI_C_PHYS:%=phys/%.o) $(LAPI_C_SCENE:%=scene/%.o) $(LAPI_C_VIDEO:%=video/%.o) $(LAPI_C_IO:%=io/%.o)
 LAPI_OBJS = $(LAPI_OBJS_T:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%) $(LAPI_LOAD:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%.o)
 CLIENT_FILES = initdevice menuhandeler callbackhandeler
@@ -188,10 +188,11 @@ $(SHARED_CLIENT_OBJS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/shared/%.cpp $(SRC_
 	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 #compile server
-SERVER_FILES =
+SERVER_FILES = lua_api/load_game lua_api/load_io
+SERVER_OBJ=$(SERVER_FILES:%=$(BUILD_DIR)/$(SERVERNAME)/%.o)
 SHARED_SERVER_FILES= $(LAPI_PATHS_T) util/hashmap phys/physcommon util/tinyobj
 SHARED_SERVER_OBJS=$(SHARED_SERVER_FILES:%=$(BUILD_DIR)/$(SERVERNAME)/%.o)
-SERVER_OBJS = $(SERVER_FILES:%=$(SERVER_BUILD_DIR)/%.o) $(SHARED_SERVER_OBJS) $(BUILD_DIR)/$(SERVERNAME)/main.o
+SERVER_OBJS = $(SERVER_OBJ) $(SHARED_SERVER_OBJS) $(BUILD_DIR)/$(SERVERNAME)/main.o
 
 $(BIN_DIR)/$(SERVERNAME)/bin/$(EX_PRE)$(SERVERNAME)$(EXE_EXT) : $(SERVER_OBJS) $(LIB_OBJS)
 	@echo "[SERVER] Building binary $@"
@@ -206,6 +207,10 @@ $(SHARED_SERVER_OBJS) : $(BUILD_DIR)/$(SERVERNAME)/%.o : $(SRC_DIR)/shared/%.cpp
 	@echo "[SERVER] CXX $<"
 	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+$(SERVER_OBJ) : $(BUILD_DIR)/$(SERVERNAME)/%.o : $(SRC_DIR)/server/%.cpp $(SRC_DIR)/server/%.hpp
+	@echo "[SERVER] CXX $<"
+	@$(CXX) $(CXXFLAGS) -c -o $@ $<
+
 #compile libraries
 $(LIBLUA) : $(ILUADIR)/Makefile
 	@echo "Could not find $(LIBLUA), rebuilding"
@@ -308,27 +313,24 @@ $(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
 	$(CP) $^ $@
 
 $(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/CMakeLists.txt
-	cd $@ && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
+	cd $(LNNGDIR)/dynamic && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
 
 $(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT)
 	cp $< $@
 
-$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT)
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT).a
 	cp $< $@
 
-$(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static/Makefile
+$(LNNGDIR)/static/libnng$(DYN_LIB_EXT).a : $(LNNGDIR)/static/Makefile
 	cd $(LNNGDIR)/static && $(MAKE) nng
 
-$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT).a : $(LNNGDIR)/dynamic/Makefile
+$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic/Makefile
 	cd $(LNNGDIR)/dynamic && $(MAKE) nng
 
 $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt
 	@echo "LIB_OBJS were $(LIB_OBJS)"
 	cd $(LNNGDIR) && cmake $(CMAKE_FLAGS) $(NNGCMAKEFLAGS)
 
-$(LNNGDIR)/libnng.dll.a : $(LNNGDIR)/Makefile
-	cd $(LNNGDIR)/dyn_lib && $(MAKE) nng
-
 TEST_BIN_NAMES=brokengine_client.exe Irrlicht.dll libnanomsg.dll libnng.dll lua51.dll
 TEST_BINS=$(TEST_BIN_NAMES:%=test/bin/%)