diff options
| author | Alexander <alex@cogarr.net> | 2020-06-29 15:29:03 -0400 |
|---|---|---|
| committer | Alexander <alex@cogarr.net> | 2020-06-29 15:29:03 -0400 |
| commit | 80789508b9655d25629223b9dcc84b4cfb77ce45 (patch) | |
| tree | 37e140e532af61c1ca4699c8b6254cf2cb07ed02 /Makefile.win | |
| parent | 44a1421c393632978d59c0698a93ae22243b97e9 (diff) | |
| download | brokengine-80789508b9655d25629223b9dcc84b4cfb77ce45.tar.gz brokengine-80789508b9655d25629223b9dcc84b4cfb77ce45.tar.bz2 brokengine-80789508b9655d25629223b9dcc84b4cfb77ce45.zip | |
Updates for mdoc
Also more tests
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.win b/Makefile.win index 059b3f1..bedd50e 100644 --- a/Makefile.win +++ b/Makefile.win @@ -6,6 +6,7 @@ CXX?=g++ MKDIR?=mkdir RM?=rm -f ECHO?=echo +LD=g++ shared_objs=$(SHARED_SRC:src/shared/%=build/shared/%.o) client_objs=$(CLIENT_SRC:src/client/%=build/client/%.o) @@ -19,7 +20,8 @@ CLIENT_LIB_DIRS=\ -Llib/bullet/lib\ -Llib/irrlicht/lib/Win32-gcc\ -Llib/luajit/src\ - -Llib/nng/static + -Llib/nng/static\ + CLIENT_LIBS=\ -lBulletDynamics\ @@ -33,8 +35,8 @@ CLIENT_LIBS=\ -lmswsock\ -ladvapi32\ -lwinmm\ - -lm\ - #-lstdc++ + -lm + #-lstdc++-6 CFLAGS+=-DNNG_STATIC_LIB ifeq ($(DEBUG), true) @@ -51,13 +53,15 @@ clean: $(RM) $(shared_objs) $(RM) $(bins) +nuke: clean + bin/client/bin/brokengine_client.exe : $(client_objs) $(shared_objs) $(Q)echo "Linking $@" - $(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) # -Wl,--verbose + $(Q)$(LD) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) # -Wl,--verbose bin/server/bin/brokengine_server.exe : $(server_objs) $(shared_objs) $(Q)echo "Linking $@" - $(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) # -Wl,--verbose + $(Q)$(LD) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) # -Wl,--verbose $(shared_objs) : build/shared/%.o : src/shared/%.cpp src/shared/%.hpp $(Q)echo "CXX $@" |