From 2be63de9e9cf8e201627fecad37acd0f1a4a6757 Mon Sep 17 00:00:00 2001
From: Alexander <alex@cogarr.net>
Date: Wed, 9 Jan 2019 16:59:36 -0500
Subject: Started automating makefile

Started working on some of the harder parts of building dependencies
with the makefile. bullet, irrlicht, and luajit all currently are
built automatically on windows under msys2
---
 Makefile | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 556179c..df20c70 100644
--- a/Makefile
+++ b/Makefile
@@ -221,7 +221,7 @@ ifeq ($(UNAME), Windows)
 		IRRMAKEFLAGS=staticlib_win32
 		IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc
 	endif
-	IRRMAKEFLAGS+=NO_IRR_COMPILE_WITH_DIRECT3D_9_
+	IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_
 else
 	IRRMADELIB=$(LIRRDIR)/lib/Linux
 endif
@@ -236,6 +236,7 @@ $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a
 	cp $^ $@
 
 $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile
+	sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
 $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
@@ -246,6 +247,7 @@ $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DY
 	cp $^ $@
 
 $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
+	sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
 ifeq ($(UNAME),Windows)
@@ -276,22 +278,22 @@ $(LIB_D_LUA) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
 	cp $^ $@
 
 # Library - Bullet
-$(LBULDIR)/src/BulletCollision/libBulletCollision.a : $(LBULDIR)/Makefile
+$(LBULDIR)/lib/libBulletCollision.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && $(MAKE) BulletCollision
 
-$(LBULDIR)/src/BulletDynamics/libBulletDynamics.a : $(LBULDIR)/Makefile
+$(LBULDIR)/lib/libBulletDynamics.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && $(MAKE) BulletDynamics
 
-$(LBULDIR)/src/LinearMath/libLinearMath.a : $(LBULDIR)/Makefile
+$(LBULDIR)/lib/libLinearMath.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && $(MAKE) LinearMath
 
-$(LIB_D_BCO) : $(LBULDIR)/src/BulletCollision/libBulletCollision.a
+$(LIB_D_BCO) : $(LBULDIR)/lib/libBulletCollision.a
 	cp $^ $@
 
-$(LIB_D_BDY) : $(LBULDIR)/src/BulletDynamics/libBulletDynamics.a
+$(LIB_D_BDY) : $(LBULDIR)/lib/libBulletDynamics.a
 	cp $^ $@
 
-$(LIB_D_BLM) : $(LBULDIR)/src/LinearMath/libLinearMath.a
+$(LIB_D_BLM) : $(LBULDIR)/lib/libLinearMath.a
 	cp $^ $@
 
 $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
@@ -311,14 +313,17 @@ $(LNNGDIR)/dynamic : $(LNNGDIR)/CMakeLists.txt
 $(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/dynamic
 	cd $< && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
 
-$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT)
+$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT) $(LNNGDIR)/static
 	cp $^ $@
 
-$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT)
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) $(LNNGDIR)/static
 	cp $^ $@
 
-$(LNNGDIR)/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/Makefile
-	cd $(LNNGDIR) && $(MAKE) nng
+$(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static $(LNNGDIR)/static/Makefile
+	$(LNNGDIR)/static/Makefile
+
+$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic $(LNNGDIR)/dynamic/Makefile
+	$(LNNGDIR)/dynamic/Makefile
 
 $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt
 	@echo "LIB_OBJS were $(LIB_OBJS)"
-- 
cgit v1.2.3-70-g09d2