diff options
| -rw-r--r-- | Makefile.win | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/Makefile.win b/Makefile.win index f4a37ae..f6c5452 100644 --- a/Makefile.win +++ b/Makefile.win @@ -12,7 +12,6 @@ MDOC=mdoc shared_objs=$(SHARED_SRC:src/shared/%=build/shared/%.o) client_objs=$(CLIENT_SRC:src/client/%=build/client/%.o) server_objs=$(SERVER_SRC:src/server/%=build/server/%.o) -client_dlls=Irrlicht client_bins=bin/client/bin/brokengine_client.exe $(client_dlls:%=bin/client/bin/%.dll) server_bins=bin/server/bin/brokengine_server.exe bins=$(client_bins) $(server_bins) @@ -38,13 +37,13 @@ CLIENT_LIBS=\ -lIrrlicht\ -lnng\ -lluajit-5.1.dll\ - -lOpenGL32\ -lws2_32\ -lmswsock\ -ladvapi32\ -lwinmm\ -lm #-lstdc++-6 + #-lOpenGL32\ CFLAGS+=-DNNG_STATIC_LIB -g ifeq ($(DEBUG), true) @@ -91,34 +90,3 @@ $(client_objs) : build/client/%.o : src/client/%.cpp src/client/%.hpp $(server_objs) : build/server/%.o : src/server/%.cpp src/server/%.hpp $(Q)echo "CXX $@" $(Q)$(CXX) $(CFLAGS) -c -o $@ $< - -bin/client/bin/Irrlicht.dll : lib/irrlicht/bin/Win32-gcc/Irrlicht.dll - cp $^ $@ - -lib/irrlicht/bin/Win32-gcc/Irrlicht.dll : lib/irrlicht/source/Irrlicht/Makefile - cd lib/irrlicht/source/Irrlicht && $(MAKE) win32 - -lib/nng/static/libnng.a: - $(Q)echo "Make $@" - $(Q)mkdir lib/nng/static - $(Q)cd lib/nng/static && cmake -G "MinGW Makefiles" -DNNG_STATIC_LIB .. && $(MAKE) - -lib/irrlicht/lib/Win32-gcc/libIrrlicht.a: - $(Q) echo "Make $@" - $(Q)cd lib/irrlicht/source/Irrlicht && $(MAKE) sharedlib_win32 - -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 |