From e3ef02473e7ab8dd4d92c65d569d7adcc4aa6364 Mon Sep 17 00:00:00 2001
From: Alexander M Pickering <alex@cogarr.net>
Date: Tue, 26 Oct 2021 19:01:02 -0500
Subject: Improve makefile for windows

Windows now build irrlicht luajit and nng from the makefile.
---
 Makefile.win | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index c3f259e..16a081e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -7,7 +7,7 @@ MKDIR?=mkdir
 RM?=rm -f
 ECHO?=echo
 LD=g++
-MDOC=mdoc.bat
+MDOC=mdoc
 
 shared_objs=$(SHARED_SRC:src/shared/%=build/shared/%.o)
 client_objs=$(CLIENT_SRC:src/client/%=build/client/%.o)
@@ -23,6 +23,10 @@ CLIENT_LIB_DIRS=\
 	-Llib/luajit/src\
 	-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
 
 CLIENT_LIBS=\
 	-lBulletDynamics\
@@ -30,7 +34,7 @@ CLIENT_LIBS=\
 	-lLinearMath\
 	-lIrrlicht\
 	-lnng\
-	-lluajit\
+	-lluajit-5.1.dll\
 	-lOpenGL32\
 	-lws2_32\
 	-lmswsock\
@@ -57,10 +61,12 @@ clean:
 
 nuke: clean
 
+doc: documentation
+
 documentation:
-	$(MDOC) -p src -o doc -t "Brok[en]gine" -i README.md -d reference -m "hoedown --disable-intra-emphasis"
+	$(MDOC) -p src -o doc -t "Brok[en]gine" -i README.md -d reference -m "markdown"
 
-bin/client/bin/brokengine_client.exe : $(client_objs) $(shared_objs)
+bin/client/bin/brokengine_client.exe : $(client_objs) $(shared_objs) $(lib_objs)
 	$(Q)echo "Linking $@"
 	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) # -Wl,--verbose
 
@@ -83,4 +89,15 @@ $(server_objs) : build/server/%.o : src/server/%.cpp src/server/%.hpp
 bin/client/bin/Irrlicht.dll : lib/irrlicht/bin/Win32-gcc/Irrlicht.dll
 	cp $^ $@
 
+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)
-- 
cgit v1.2.3-70-g09d2