diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 74 |
1 files changed, 41 insertions, 33 deletions
@@ -3,7 +3,7 @@ ifeq ($(OS), Windows_NT) UNAME:=Windows else - UNAME:=$(shell uname -s) + UNAME:=$(shell uname -s) endif ifeq ($(UNAME), Windows) @@ -49,15 +49,15 @@ ECHO?=echo LLUADIR=$(LIB_DIR)/luajit LIRRDIR=$(LIB_DIR)/irrlicht LBULDIR=$(LIB_DIR)/bullet -LNANDIR=$(LIB_DIR)/nanomsg +LNNGDIR=$(LIB_DIR)/nng #Include directories ILUADIR=$(LLUADIR)/src IIRRDIR=$(LIRRDIR)/include IBULDIR=$(LBULDIR)/src -INANDIR=$(LNANDIR)/src +INNGDIR=$(LNNGDIR)/src ISHADIR=src -INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INANDIR) -I$(ISHADIR) +INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INNGDIR) -I$(ISHADIR) #library directories CXXFLAGS+=$(INCLUDE_PATHS) @@ -71,7 +71,7 @@ LIB_S_IRR=lib/libIrrlicht.a LIB_S_BCO=lib/libBulletCollision.a LIB_S_BDY=lib/libBulletDynamics.a LIB_S_BLM=lib/libLinearMath.a -LIB_S_NAN=lib/libnanomsg.a +LIB_S_NNG=lib/libnng.a #dynamic libraries LIB_D_LUA=lib/lua51$(DYN_LIB_EXT) @@ -80,22 +80,22 @@ 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/libnanomsg$(DYN_LIB_EXT) +LIB_D_NNG=lib/libnng$(DYN_LIB_EXT) -CLIENT_DLLS=Irrlicht libnanomsg lua51 -SERVER_DLLS=libnanomsg lua51 +CLIENT_DLLS=Irrlicht libnng lua51 +SERVER_DLLS=libnng lua51 ifeq ($(DEBUG),true) - LIB_OBJS = $(LIB_D_LUA) $(LIB_D_IRR) $(LIB_D_BCO) $(LIB_D_BDY) $(LIB_D_BLM) $(LIB_D_NAN) + LIB_OBJS = $(LIB_D_LUA) $(LIB_D_IRR) $(LIB_D_BCO) $(LIB_D_BDY) $(LIB_D_BLM) $(LIB_D_NNG) BINS+=$(CLIENT_DLLS:%=$(BIN_DIR)/$(CLIENTNAME)/bin/%$(DYN_LIB_EXT)) $(SERVER_DLLS:%=$(BIN_DIR)/$(SERVERNAME)/bin/%$(DYN_LIB_EXT)) else - LIB_OBJS = $(LIB_S_LUA) $(LIB_S_IRR) $(LIB_S_BCO) $(LIB_S_BDY) $(LIB_S_BLM) $(LIB_S_NAN) + LIB_OBJS = $(LIB_S_LUA) $(LIB_S_IRR) $(LIB_S_BCO) $(LIB_S_BDY) $(LIB_S_BLM) $(LIB_S_NNG) endif # Libraries #order matters! -CLIENT_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg -SERVER_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lnanomsg -#LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnanomsg +CLIENT_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnng +SERVER_LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lnng +#LIBS=-lBulletDynamics -lBulletCollision -lLinearMath -lIrrlicht -lnng ifeq ($(UNAME),Windows) CLIENT_LIBS+=-lOpenGL32 else @@ -114,14 +114,14 @@ endif ifeq ($(DEBUG), true) else - CXXFLAGS += -static $(INCLUDE_PATHS) -D_IRR_STATIC_LIB_ -DNN_STATIC_LIB + CXXFLAGS += -static $(INCLUDE_PATHS) -D_IRR_STATIC_LIB_ -DNNG_STATIC_LIB endif S_LDFLAGS= $(SERVER_LIBS) C_LDFLAGS= $(CLIENT_LIBS) ifeq ($(UNAME),Windows) C_LDFLAGS += -mwindows -lwinmm ifeq ($(DEBUG),true) - + else C_LDFLAGS += -lws2_32 -lmswsock -ladvapi32 S_LDFLAGS += -lws2_32 -lmswsock -ladvapi32 @@ -150,7 +150,7 @@ SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/ SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) # The client-side only stuff -LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiskin iguiutil iguiwindow +LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiskin iguiutil iguiwindow iguieditbox LAPI_PHYS = bphysmodel cbphysbox LAPI_SCENE = icamera igeneric ilight imesh LAPI_VIDEO = iimage itexture smaterial @@ -159,11 +159,11 @@ LAPI_OBJS_T = $(LAPI_GUI:%=gui/%.o) $(LAPI_PHYS:%=phys/%.o) $(LAPI_SCENE:%=scene LAPI_OBJS = $(LAPI_OBJS_T:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%) $(LAPI_LOAD:%=$(BUILD_DIR)/$(CLIENTNAME)/lua_api/%.o) CLIENT_FILES = initdevice menuhandeler callbackhandeler CLIENT_SRCS = $(CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) $(LAPI_OBJS) -CLIENT_OBJS = $(BUILD_DIR)/$(CLIENTNAME)/main.o $(CLIENT_SRCS) $(SHARED_CLIENT_OBJS) +CLIENT_OBJS = $(BUILD_DIR)/$(CLIENTNAME)/main.o $(CLIENT_SRCS) $(SHARED_CLIENT_OBJS) #Compile the client $(BIN_DIR)/$(CLIENTNAME)/bin/$(EX_PRE)$(CLIENTNAME)$(EXE_EXT) : $(CLIENT_OBJS) $(LIB_OBJS) - @echo "Building binary $@" + @echo "[CLIENT] Building binary $@" @$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(C_LDFLAGS) $(LIB_OBJS) # -Wl,--verbose # does not have .hpp associated @@ -185,7 +185,7 @@ 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) - @echo "Building binary $^" + @echo "[SERVER] Building binary $@" @$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(S_LDFLAGS) # Special, main does not have a .hpp associated with it @@ -216,6 +216,7 @@ ifeq ($(UNAME), Windows) IRRMAKEFLAGS=staticlib_win32 IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc endif + IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_ else IRRMADELIB=$(LIRRDIR)/lib/Linux endif @@ -228,6 +229,7 @@ $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS) $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) + @echo "Could not find $@, remaking..." cp $^ $@ $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) @@ -279,27 +281,33 @@ $(LIB_D_BLM) : $(LBULDIR)/lib/libLinearMath.a $(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) : $(LIB_D_NAN) +# Library - NNG +NNGFLAGS= +ifeq ($(DEBUG),true) + NNGCMAKEFLAGS += -DBUILD_SHARED_LIBS="TRUE" +endif +$(BIN_DIR)/$(CLIENTNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG) cp $^ $@ -$(LIB_D_NAN) : $(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT) +$(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG) cp $^ $@ -$(LNANDIR)/dyn_lib/libnanomsg$(DYN_LIB_EXT) : $(LNANDIR)/dyn_lib/Makefile - cd $(LNANDIR)/dyn_lib/ && $(MAKE) nanomsg +$(LIB_S_NNG) : $(LNNGDIR)/libnng.a + cp $^ $@ -$(LNANDIR)/dyn_lib/Makefile : $(LNANDIR)/CMakeLists.txt $(LNANDIR)/dyn_lib - cd $(LNANDIR)/dyn_lib && cmake $(CMAKE_FLAGS) ../ +$(LIB_D_NNG) : $(LNNGDIR)/libnng$(DYN_LIB_EXT) + cp $^ $@ -$(LNANDIR)/dyn_lib : - mkdir $(LNANDIR)/dyn_lib +$(LNNGDIR)/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/Makefile + cd $(LNNGDIR) && $(MAKE) nng -$(LNANDIR)/dyn_lib/libnanomsg.dll.a : $(LNANDIR)/dyn_lib/Makefile - cd $(LNANDIR)/dyn_lib && $(MAKE) nanomsg +$(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt + @echo "LIB_OBJS were $(LIB_OBJS)" + cd $(LNNGDIR) && cmake $(CMAKE_FLAGS) $(NNGCMAKEFLAGS) -$(LIB_S_NAN) : $(LNANDIR)/dyn_lib/libnanomsg.dll.a - cp $^ $@ + +$(LNNGDIR)/libnng.dll.a : $(LNNGDIR)/Makefile + cd $(LNNGDIR)/dyn_lib && $(MAKE) nng #compile & run tests test: $(TEST_PATH)test_stream $(TEST_PATH)test_phys @@ -315,7 +323,7 @@ $(TEST_PATH)test_phys : $(TEST_SRC)test_phys.cpp $(CC) $(CFLAGS) -o $(TEST_PATH)test_phys $(TEST_SRC)test_phys.cpp $(SLIBS) #end tests -cleantest : +cleantest : echo $(BUILDS:%=%/*.o) clean : |