From f0d98ad70d2188197be00f6c1a9b7338473c6485 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alex@cogarr.net>
Date: Tue, 18 Dec 2018 20:10:10 -0500
Subject: Various fixes to get things working under msys2

Replaced various "make" calls in the makefile with $(MAKE)
Replaced a few __mingw_printf with just printf
Added some instructions to the readme
---
 Makefile | 55 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4a60dec..556179c 100644
--- a/Makefile
+++ b/Makefile
@@ -213,22 +213,24 @@ $(LIBLUA) : $(ILUADIR)/Makefile
 
 IRRMAKEFLAGS=
 IRRMADELIB=
-ifeq ($(DEBUG),true)
-	IRRMAKEFLAGS+=NDEBUG=1
-endif
 ifeq ($(UNAME), Windows)
 	ifeq ($(DEBUG),true)
-		IRRMAKEFLAGS+=dynamiclib_win32
+		IRRMAKEFLAGS=sharedlib_win32
 		IRRMADELIB=$(LIRRDIR)/bin/Win32-gcc
 	else
 		IRRMAKEFLAGS=staticlib_win32
 		IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc
 	endif
-	IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_
+	IRRMAKEFLAGS+=NO_IRR_COMPILE_WITH_DIRECT3D_9_
 else
 	IRRMADELIB=$(LIRRDIR)/lib/Linux
 endif
 
+ifeq ($(DEBUG),true)
+else
+	IRRMAKEFLAGS+=NDEBUG=1
+endif
+
 # Library - Irrlicht
 $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a
 	cp $^ $@
@@ -243,9 +245,15 @@ $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 	cp $^ $@
 
-$(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
+$(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
+ifeq ($(UNAME),Windows)
+	LUAJIT_ARGS:= TARGET_SYS=Windows
+else
+	LUAJIT_ARGS:=
+endif
+
 # Library - Lua
 # Client
 $(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
@@ -256,34 +264,34 @@ $(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
 	cp $^ $@
 
 $(LLUADIR)/src/libluajit$(STA_LIB_EXT) : $(LLUADIR)/src/Makefile
-	cd $(LLUADIR)/src && make "BUILDMODE= static"
+	cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= static"
 
 $(LIB_S_LUA) : $(LLUADIR)/src/libluajit$(STA_LIB_EXT)
 	cp $^ $@
 
 $(LLUADIR)/src/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/Makefile
-	cd $(LLUADIR)/src && make "BUILDMODE= dynamic"
+	cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= dynamic"
 
 $(LIB_D_LUA) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
 	cp $^ $@
 
 # Library - Bullet
-$(LBULDIR)/lib/libBulletCollision.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make BulletCollision
+$(LBULDIR)/src/BulletCollision/libBulletCollision.a : $(LBULDIR)/Makefile
+	cd $(LBULDIR) && $(MAKE) BulletCollision
 
-$(LBULDIR)/lib/libBulletDynamics.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make BulletDynamics
+$(LBULDIR)/src/BulletDynamics/libBulletDynamics.a : $(LBULDIR)/Makefile
+	cd $(LBULDIR) && $(MAKE) BulletDynamics
 
-$(LBULDIR)/lib/libLinearMath.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make LinearMath
+$(LBULDIR)/src/LinearMath/libLinearMath.a : $(LBULDIR)/Makefile
+	cd $(LBULDIR) && $(MAKE) LinearMath
 
-$(LIB_D_BCO) : $(LBULDIR)/lib/libBulletCollision.a
+$(LIB_D_BCO) : $(LBULDIR)/src/BulletCollision/libBulletCollision.a
 	cp $^ $@
 
-$(LIB_D_BDY) : $(LBULDIR)/lib/libBulletDynamics.a
+$(LIB_D_BDY) : $(LBULDIR)/src/BulletDynamics/libBulletDynamics.a
 	cp $^ $@
 
-$(LIB_D_BLM) : $(LBULDIR)/lib/libLinearMath.a
+$(LIB_D_BLM) : $(LBULDIR)/src/LinearMath/libLinearMath.a
 	cp $^ $@
 
 $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
@@ -291,19 +299,22 @@ $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
 
 # Library - NNG
 NNGFLAGS=
-ifeq ($(DEBUG),true)
-	NNGCMAKEFLAGS += -DBUILD_SHARED_LIBS="TRUE"
-endif
 $(BIN_DIR)/$(CLIENTNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
 	cp $^ $@
 
 $(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
 	cp $^ $@
 
-$(LIB_S_NNG) : $(LNNGDIR)/libnng.a
+$(LNNGDIR)/dynamic : $(LNNGDIR)/CMakeLists.txt
+	mkdir $@
+
+$(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/dynamic
+	cd $< && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
+
+$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT)
 	cp $^ $@
 
-$(LIB_D_NNG) : $(LNNGDIR)/libnng$(DYN_LIB_EXT)
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT)
 	cp $^ $@
 
 $(LNNGDIR)/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/Makefile
-- 
cgit v1.2.3-70-g09d2