From 969991ddc602ca485e234985e4b75dda606695ec Mon Sep 17 00:00:00 2001
From: Uriel Corfa <korfuri@gmail.com>
Date: Mon, 29 Apr 2019 00:11:06 +0900
Subject: [PATCH] Vendor GLM

---
 .gitmodules  | 3 +++
 .travis.yml  | 2 --
 Makefile     | 4 ++--
 src/deps/glm | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 160000 src/deps/glm

diff --git a/.gitmodules b/.gitmodules
index ebc80e8..cd36ea3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "projectM"]
 	path = src/deps/projectm
 	url = https://github.com/projectM-visualizer/projectm.git
+[submodule "src/deps/glm"]
+	path = src/deps/glm
+	url = https://github.com/g-truc/glm
diff --git a/.travis.yml b/.travis.yml
index 26dce35..b83c3f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,10 @@ addons:
     packages:
     - autoconf
     - libtool
-    - libglm-dev
     - libgl1-mesa-dev
     - libglu1-mesa-dev
   homebrew:
     packages:
-    - glm
     - sdl2
     - automake
     - libtool
diff --git a/Makefile b/Makefile
index 64d1fa1..53a5433 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,8 @@ dep: $(LIBPROJECTM)
 src/deps/projectm/src/libprojectM/.libs/libprojectM.a:
 	(cd src/deps/projectm; git apply ../projectm_*.diff || true)
 	(cd src/deps/projectm; ./autogen.sh)
-	(cd src/deps/projectm; ./configure --with-pic --enable-static --disable-threading)
-	(cd src/deps/projectm; make)
+	(cd src/deps/projectm; export CFLAGS=-I$(shell pwd)/src/deps/glm CXXFLAGS=-I$(shell pwd)/src/deps/glm ; ./configure --with-pic --enable-static --disable-threading)
+	(cd src/deps/projectm; export CFLAGS=-I$(shell pwd)/src/deps/glm CXXFLAGS=-I$(shell pwd)/src/deps/glm ; make)
 
 depclean:
 	(cd src/deps/projectm; make clean)
diff --git a/src/deps/glm b/src/deps/glm
new file mode 160000
index 0000000..d162eee
--- /dev/null
+++ b/src/deps/glm
@@ -0,0 +1 @@
+Subproject commit d162eee1e6f7c317a09229fe6ceab8ec6ab9a4b4