Removed some redundency

1 files changed, 60 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 834b37d..de999fa 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ LIB_D_IRR=lib/Irrlicht$(DYN_LIB_EXT)
 LIB_D_BCO=$(LIB_S_BCO)
 LIB_D_BDY=$(LIB_S_BDY)
 LIB_D_BLM=$(LIB_S_BLM)
-LIB_D_NAN=lib/nanomsg/libnanomsg$(DYN_LIB_EXT)
+LIB_D_NAN=lib/libnanomsg$(DYN_LIB_EXT)
 
 CLIENT_DLLS=Irrlicht libnanomsg lua51
 SERVER_DLLS=libnanomsg lua51
@@ -93,30 +93,39 @@ endif
 
 # Libraries
 #order matters!
-LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg
+CLIENT_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg
+SERVER_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lnanomsg
+#LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg
 ifeq ($(UNAME),Windows)
-	LIBS+=-lOpenGL32
+	CLIENT_LIBS+=-lOpenGL32
 else
-	LIBS+=-lGL
+	CLIENT_LIBS+=-lGL
 endif
 ifeq ($(DEBUG),true)
-	LIBS+=-llua51
+	CLIENT_LIBS+=-llua51
+	SERVER_LIBS+=-llua51
 else
-	LIBS+=-lluajit
+	CLIENT_LIBS+=-lluajit
+	SERVER_LIBS+=-lluajit
 endif
 
 #can't compile with -std=c++11 because irrlicht will complain
-LDFLAGS+=$(LIBS)
+#LDFLAGS+=$(LIBS)
 ifeq ($(DEBUG), true)
 
 else
 	CXXFLAGS += -static $(INCLUDE_PATHS) -D_IRR_STATIC_LIB_ -DNN_STATIC_LIB
 endif
-
-C_LDFLAGS=
+S_LDFLAGS= $(SERVER_LIBS)
+C_LDFLAGS= $(CLIENT_LIBS)
 ifeq ($(UNAME),Windows)
-	LDFLAGS+=-mwindows -lwinmm
-	STATIC_LIBS+=-lws2_32 -lmswsock -ladvapi32 
+	C_LDFLAGS += -mwindows -lwinmm
+	ifeq ($(DEBUG),true)
+	
+	else
+		C_LDFLAGS += -lws2_32 -lmswsock -ladvapi32
+		S_LDFLAGS += -lws2_32 -lmswsock -ladvapi32
+	endif
 endif
 
 ifeq ($(DEBUG),true)
@@ -129,14 +138,14 @@ ifeq ($(DEBUG),true)
 	CXXFLAGS+=-O0 -g -Wall -Werror
 else
 	CXXFLAGS+=-O3
-	LDFLAGS+=#--strip-all
+	LDFLAGS+=--strip-all
 endif
 
 FSYSTEM_FOLDERS = lua_api phys util lua_api/irr lua_api/phys lua_api/gui lua_api/scene lua_api/video
 CLIENT_BUILD_FOLDERS = $(FSYSTEM_FOLDERS:%=$(BUILD_DIR)/$(CLIENTNAME)/%)
 
 all : $(BINS)
-	@echo built $(BINS)
+	@echo "Done"
 
 SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/hashmap lua_api/stream lua_api/load_net
 SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o)
@@ -155,7 +164,7 @@ CLIENT_OBJS = $(BUILD_DIR)/$(CLIENTNAME)/main.o $(CLIENT_SRCS) $(SHARED_CLIENT_O
 
 #Compile the client
 $(BIN_DIR)/$(CLIENTNAME)/bin/$(EX_PRE)$(CLIENTNAME)$(EXE_EXT) : $(CLIENT_OBJS) $(LIB_OBJS)
-	@echo "Building binary $^"
+	@echo "Building binary $@"
 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(C_LDFLAGS) $(LIB_OBJS) # -Wl,--verbose
 
 # does not have .hpp associated
@@ -163,11 +172,11 @@ $(BUILD_DIR)/$(CLIENTNAME)/main.o : $(SRC_DIR)/client/main.cpp
 	@$(CXX) $(CXXFLAGS) -c -o $@ $^
 
 $(CLIENT_SRCS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/client/%.cpp $(SRC_DIR)/client/%.hpp
-	@echo "Building client $^"
+	@echo "[CLIENT] CXX $<"
 	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 $(SHARED_CLIENT_OBJS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/shared/%.cpp $(SRC_DIR)/shared/%.hpp
-	@echo "Building shared $<"
+	@echo "[CLIENT] CXX $<"
 	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 #compile server
@@ -177,14 +186,17 @@ 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
 
 $(BIN_DIR)/$(SERVERNAME)/bin/$(EX_PRE)$(SERVERNAME)$(EXE_EXT) : $(SERVER_OBJS) $(LIB_OBJS)
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+	@echo "Building binary $^"
+	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(S_LDFLAGS)
 
 # Special, main does not have a .hpp associated with it
 $(BUILD_DIR)/$(SERVERNAME)/main.o : $(SRC_DIR)/server/main.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $^
+	@echo "[SERVER] CXX $<"
+	@$(CXX) $(CXXFLAGS) -c -o $@ $^
 
 $(SHARED_SERVER_OBJS) : $(BUILD_DIR)/$(SERVERNAME)/%.o : $(SRC_DIR)/shared/%.cpp $(SRC_DIR)/shared/%.hpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+	@echo "[SERVER] CXX $<"
+	@$(CXX) $(CXXFLAGS) -c -o $@ $<
 
 #compile libraries
 $(LIBLUA) : $(ILUADIR)/Makefile
@@ -216,6 +228,9 @@ $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a
 $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
+$(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
+	cp $^ $@
+
 $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 	cp $^ $@
 
@@ -223,37 +238,53 @@ $(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
 # Library - Lua
-$(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
+# Client
+$(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
 	cp $^ $@
 
-$(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
+# Server
+$(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
 	cp $^ $@
 
 $(LIB_S_LUA) : $(LLUADIR)/src/libluajit.a
 	cp $^ $@
 
-$(LIB_D_LUA) : $(LLUADIR)/src/Makefile
-	@echo "Could not find $(LLUADIR)/src/lua51$(DYN_LIB_EXT), rebuilding"
+$(LLUADIR)/src/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/Makefile
 	cd $(LLUADIR)/src && make "BUILDMODE= dynamic"
 
+$(LIB_D_LUA) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
+	cp $^ $@
+
 # Library - Bullet
-$(LIB_D_BCO) : $(LBULDIR)/Makefile
+$(LBULDIR)/src/BulletCollision/libBulletCollision.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && make BulletCollision
 
-$(LIB_D_DY) : $(LBULDIR)/Makefile
+$(LBULDIR)/src/BulletDynamics/libBulletDynamics.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && make BulletDynamics
 
-$(LIB_D_BLM) : $(LBULDIR)/Makefile
+$(LBULDIR)/src/LinearMath/libLinearMath.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && make LinearMath
 
+$(LIB_D_BCO) : $(LBULDIR)/src/BulletCollision/libBulletCollision.a
+	cp $^ $@
+
+$(LIB_D_BDY) : $(LBULDIR)/src/BulletDynamics/libBulletDynamics.a
+	cp $^ $@
+
+$(LIB_D_BLM) : $(LBULDIR)/src/LinearMath/libLinearMath.a
+	cp $^ $@
+
 $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
 	cd $(LBULDIR) && cmake $(CMAKE_FLAGS) -DBUILD_EXTRAS=off -DBUILD_DEMOS=off
 
 # Library - Nanomsg
-$(BIN_DIR)/$(CLIENTNAME)/bin/libnanomsg$(DYN_LIB_EXT) : $(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT)
+$(BIN_DIR)/$(CLIENTNAME)/bin/libnanomsg$(DYN_LIB_EXT) : $(LIB_D_NAN)
+	cp $^ $@
+
+$(LIB_D_NAN) : $(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT)
 	cp $^ $@
 
-$(LIB_D_NAN) : $(LNANDIR)/dyn_lib/Makefile
+$(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT) : $(LNANDIR)/dyn_lib/Makefile
 	cd $(LNANDIR)/dyn_lib/ && $(MAKE) nanomsg
 
 $(LNANDIR)/dyn_lib/Makefile : $(LNANDIR)/CMakeLists.txt $(LNANDIR)/dyn_lib
@@ -284,4 +315,5 @@ cleantest :
 
 clean :
 	$(RM) $(CLIENT_OBJS)
+	$(RM) $(SERVER_OBJS)
 	$(RM) $(BINS)