From 80789508b9655d25629223b9dcc84b4cfb77ce45 Mon Sep 17 00:00:00 2001
From: Alexander <alex@cogarr.net>
Date: Mon, 29 Jun 2020 15:29:03 -0400
Subject: Updates for mdoc

Also more tests
---
 Makefile.win | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Makefile.win')

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 $@"
-- 
cgit v1.2.3-70-g09d2