aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile25
1 files changed, 15 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 3d1e343..4a60dec 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,16 @@ LLUADIR=$(LIB_DIR)/luajit
LIRRDIR=$(LIB_DIR)/irrlicht
LBULDIR=$(LIB_DIR)/bullet
LNNGDIR=$(LIB_DIR)/nng
+LOBJDIR=$(LIB_DIR)/tinyobjloader-c
#Include directories
ILUADIR=$(LLUADIR)/src
IIRRDIR=$(LIRRDIR)/include
IBULDIR=$(LBULDIR)/src
INNGDIR=$(LNNGDIR)/src
+IOBJDIR=$(LOBJDIR)/
ISHADIR=src
-INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INNGDIR) -I$(ISHADIR)
+INCLUDE_PATHS=-I$(ILUADIR) -I$(IIRRDIR) -I$(IBULDIR) -I$(INNGDIR) -I$(ISHADIR) -I$(IOBJDIR)
#library directories
CXXFLAGS+=$(INCLUDE_PATHS)
@@ -146,17 +148,20 @@ CLIENT_BUILD_FOLDERS = $(FSYSTEM_FOLDERS:%=$(BUILD_DIR)/$(CLIENTNAME)/%)
all : $(BINS)
@echo "Done"
-SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/hashmap lua_api/stream lua_api/load_net
+LAPI_S_PHYS = bhingeconstraint bphysbox bphysmodel bphysgeneric
+LAPI_S_LOAD = load_phys load_net common stream
+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)
# The client-side only stuff
-LAPI_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector iguifiledialog iguispinbox iguitreeview
-LAPI_PHYS = bphysmodel cbphysbox bphysgeneric
-LAPI_SCENE = icamera igeneric ilight imesh
-LAPI_VIDEO = iimage itexture smaterial
-LAPI_IO = ifilesystem
-LAPI_LOAD = load_gui load_game load_scene load_phys load_video load_io
-LAPI_OBJS_T = $(LAPI_GUI:%=gui/%.o) $(LAPI_PHYS:%=phys/%.o) $(LAPI_SCENE:%=scene/%.o) $(LAPI_VIDEO:%=video/%.o) $(LAPI_IO:%=io/%.o)
+LAPI_C_GUI = iguibutton iguicheckbox iguielement iguiimage iguilabel iguiwindow iguieditbox iguicolorselector iguifiledialog iguispinbox iguitreeview
+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_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
CLIENT_SRCS = $(CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o) $(LAPI_OBJS)
@@ -183,7 +188,7 @@ $(SHARED_CLIENT_OBJS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/shared/%.cpp $(SRC_
#compile server
SERVER_FILES =
-SHARED_SERVER_FILES= util/hashmap lua_api/common phys/physcommon lua_api/load_net lua_api/load_phys lua_api/phys/bphysbox lua_api/stream
+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