diff options
| -rw-r--r-- | Makefile.shared | 2 | ||||
| -rw-r--r-- | Makefile.win | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.shared b/Makefile.shared index 2186a43..2ed32f4 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -62,7 +62,7 @@ SERVER_SRC=\ src/server/lua_api/load_io\ # Include paths -CFLAGS += -Ilib/luajit/src -Ilib/irrlicht/include -Isrc -Ilib/bullet/src -Ilib/tinyobjloader-c -Ilib/nng/include +CFLAGS += -Ilib/luajit/src -Ilib/irrlicht/include -Isrc -Ilib/bulletminus/src -Ilib/tinyobjloader-c -Ilib/nng/include ifeq ($(DEBUG), true) CFLAGS += -g -shared -Wall -Werror -fPIC diff --git a/Makefile.win b/Makefile.win index 2cb4d57..5b0ad92 100644 --- a/Makefile.win +++ b/Makefile.win @@ -18,15 +18,18 @@ server_bins=bin/server/bin/brokengine_server.exe bins=$(client_bins) $(server_bins) CLIENT_LIB_DIRS=\ - -Llib/bullet/lib\ + -Llib/bulletminus/dist\ -Llib/irrlicht/lib/Win32-gcc\ -Llib/luajit/src\ - -Llib/nng/static\ + -Llib/nng/static lib_objs=\ lib/nng/static/libnng.a\ lib/irrlicht/lib/Win32-gcc/libIrrlicht.a\ - lib/luajit/src/libluajit-5.1.dll.a + lib/luajit/src/libluajit-5.1.dll.a\ + lib/bulletminus/dist/libbulletdynamics.a\ + lib/bulletminus/dist/libbulletcollision.a\ + lib/bulletminus/dist/liblinearmath.a CLIENT_LIBS=\ -lBulletDynamics\ @@ -107,3 +110,15 @@ lib/irrlicht/lib/Win32-gcc/libIrrlicht.a: lib/luajit/src/libluajit-5.1.dll.a: $(Q) echo "Make $@" $(Q)cd lib/luajit/src && $(MAKE) + +lib/bulletminus/dist/libbulletdynamics.a: + $(Q) echo "Make $@" + $(Q)cd lib/bulletminus & $(MAKE) dist/libbulletdynamics.a + +lib/bulletminus/dist/libbulletcollision.a: + $(Q) echo "Make $@" + $(Q)cd lib/bulletminus & $(MAKE) dist/libbulletcollision.a + +lib/bulletminus/dist/liblinearmath.a: + $(Q) echo "Make $@" + $(Q)cd lib/bulletminus & $(MAKE) dist/liblinearmath.a |