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
---
 .gitmodules | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.gitmodules')

diff --git a/.gitmodules b/.gitmodules
index 450740d..86d0d15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,9 @@
 [submodule "lib/luajit"]
 	path = lib/luajit
 	url = https://gitlab.com/bbblitz/luajit/
+[submodule "lib/tinyobjloader-c"]
+	path = lib/tinyobjloader-c
+	url = http://cogarr.net/source/cgit.cgi/tinyobjloader-c/
+[submodule "lib/nng"]
+	path = lib/nng
+	url = http://cogarr.net/source/cgit.cgi/nng/
-- 
cgit v1.2.3-70-g09d2


From 4c2a1ce7a1b95b877aa2cbb9ff05c000f3e7db2b Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alex@cogarr.net>
Date: Thu, 10 Jan 2019 16:02:42 -0500
Subject: Fixed debug build for windows

Fixed some things in the nng library to make a complete DEBUG=true
build on windows under msys
---
 .gitmodules | 10 +++++-----
 Makefile    | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to '.gitmodules')

diff --git a/.gitmodules b/.gitmodules
index 86d0d15..adc017d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,16 @@
 [submodule "lib/bullet"]
 	path = lib/bullet
-	url = https://gitlab.com/bbblitz/bullet3/
+	url = https://cogarr.net/source/cgit.cgi/bullet3/
 	branch = master
 [submodule "lib/irrlicht"]
 	path = lib/irrlicht
-	url = https://gitlab.com/bbblitz/irrlicht/
+	url = https://cogarr.net/source/cgit.cgi/irrlicht/
 [submodule "lib/luajit"]
 	path = lib/luajit
-	url = https://gitlab.com/bbblitz/luajit/
+	url = https://cogarr.net/source/cgit.cgi/luajit/
 [submodule "lib/tinyobjloader-c"]
 	path = lib/tinyobjloader-c
-	url = http://cogarr.net/source/cgit.cgi/tinyobjloader-c/
+	url = https://cogarr.net/source/cgit.cgi/tinyobjloader-c/
 [submodule "lib/nng"]
 	path = lib/nng
-	url = http://cogarr.net/source/cgit.cgi/nng/
+	url = https://cogarr.net/source/cgit.cgi/nng/
diff --git a/Makefile b/Makefile
index df20c70..4b86147 100644
--- a/Makefile
+++ b/Makefile
@@ -221,7 +221,6 @@ ifeq ($(UNAME), Windows)
 		IRRMAKEFLAGS=staticlib_win32
 		IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc
 	endif
-	IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_
 else
 	IRRMADELIB=$(LIRRDIR)/lib/Linux
 endif
@@ -314,16 +313,16 @@ $(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/dynamic
 	cd $< && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
 
 $(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT) $(LNNGDIR)/static
-	cp $^ $@
+	cp $< $@
 
-$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) $(LNNGDIR)/static
-	cp $^ $@
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) $(LNNGDIR)/dynamic
+	cp $< $@
 
 $(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static $(LNNGDIR)/static/Makefile
-	$(LNNGDIR)/static/Makefile
+	cd $(LNNGDIR)/static && $(MAKE) nng
 
 $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic $(LNNGDIR)/dynamic/Makefile
-	$(LNNGDIR)/dynamic/Makefile
+	cd $(LNNGDIR)/dynamic && $(MAKE) nng
 
 $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt
 	@echo "LIB_OBJS were $(LIB_OBJS)"
-- 
cgit v1.2.3-70-g09d2


From 575b6d26739b1daa9031dab9927b77cfee3ce961 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alex@cogarr.net>
Date: Thu, 10 Jan 2019 16:13:51 -0500
Subject: Correction in git modules paths

---
 .gitmodules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.gitmodules')

diff --git a/.gitmodules b/.gitmodules
index adc017d..9e74966 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,16 @@
 [submodule "lib/bullet"]
 	path = lib/bullet
-	url = https://cogarr.net/source/cgit.cgi/bullet3/
+	url = http://cogarr.net/source/cgit.cgi/bullet/
 	branch = master
 [submodule "lib/irrlicht"]
 	path = lib/irrlicht
-	url = https://cogarr.net/source/cgit.cgi/irrlicht/
+	url = http://cogarr.net/source/cgit.cgi/irrlicht/
 [submodule "lib/luajit"]
 	path = lib/luajit
-	url = https://cogarr.net/source/cgit.cgi/luajit/
+	url = http://cogarr.net/source/cgit.cgi/luajit/
 [submodule "lib/tinyobjloader-c"]
 	path = lib/tinyobjloader-c
-	url = https://cogarr.net/source/cgit.cgi/tinyobjloader-c/
+	url = http://cogarr.net/source/cgit.cgi/tinyobjloader-c/
 [submodule "lib/nng"]
 	path = lib/nng
-	url = https://cogarr.net/source/cgit.cgi/nng/
+	url = http://cogarr.net/source/cgit.cgi/nng/
-- 
cgit v1.2.3-70-g09d2