Vendor GLM

korfuri · Apr 28, 2019 · 969991d · 969991d
1 parent 758d5cd
commit 969991d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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