diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -7,6 +7,11 @@ else endif CP=cp +CXX?=g++ +MKDIR?=mkdir +RM?=rm -f +ECHO?=echo + ifeq ($(UNAME), Windows) EXE_EXT=.exe STA_LIB_EXT=.a @@ -42,10 +47,6 @@ BINS+= $(foreach part,$(EX_PARTS),$(BIN_DIR)/$(part)/bin/$(EX_PRE)$(part)$(EXE_E BUILDS = $(EX_PARTS:%=$(BUILD_DIR)/%) SRC_DIRS = $(EX_PARTS:%=$(SRC_DIR)/%) -CXX?=g++ -MKDIR?=mkdir -RM?=rm -f -ECHO?=echo LLUADIR=$(LIB_DIR)/luajit LIRRDIR=$(LIB_DIR)/irrlicht @@ -151,7 +152,7 @@ all : $(BINS) # The shared stuff LAPI_S_PHYS = bhingeconstraint bphysbox bphysmodel bphysgeneric bcharactercontroller bghostobject bcollider -LAPI_S_LOAD = load_phys load_net common stream +LAPI_S_LOAD = load_phys load_net common stream load_common LAPI_PATHS_T = $(LAPI_S_PHYS:%=lua_api/phys/%) $(LAPI_S_LOAD:%=lua_api/%) SHARED_CLIENT_FILES = $(LAPI_PATHS_T) phys/physcommon util/hashmap util/tinyobj SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) @@ -179,7 +180,7 @@ $(BUILD_DIR)/$(CLIENTNAME)/main.o : $(SRC_DIR)/client/main.cpp @$(CXX) $(CXXFLAGS) -c -o $@ $^ # does have the .hpp associated in src/client -$(CLIENT_SRCS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/client/%.cpp $(SRC_DIR)/client/%.hpp +$(CLIENT_SRCS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/client/%.cpp $(SRC_DIR)/client/%.hpp $(LIB_OBJS) @echo "[CLIENT] CXX $<" @$(CXX) $(CXXFLAGS) -c -o $@ $< @@ -234,7 +235,7 @@ endif ifeq ($(DEBUG),true) else - IRRMAKEFLAGS+=NDEBUG=1 + IRRMAKEFLAGS+=NDEBUG=1 endif # Library - Irrlicht @@ -242,7 +243,7 @@ $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a $(CP) $^ $@ $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile - sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile + sed --in-place=OLD 's/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS) $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) @@ -253,7 +254,7 @@ $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DY $(CP) $^ $@ $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile - sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile + sed --in-place=OLD 's/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS) ifeq ($(UNAME),Windows) @@ -317,16 +318,18 @@ $(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/CMakeLists.txt cd $(LNNGDIR)/dynamic && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../ $(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT) - cp $< $@ + $(CP) $< $@ $(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) - cp $< $@ + $(CP) $< $@ $(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static/Makefile cd $(LNNGDIR)/static && $(MAKE) nng + ln -s $(LNNGDIR)/src $(LNNGDIR)/include/nng $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic/Makefile cd $(LNNGDIR)/dynamic && $(MAKE) nng + ln -s $(LNNGDIR)/src $(LNNGDIR)/include/nng $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt @echo "LIB_OBJS were $(LIB_OBJS)" |