From b11a6e14b8a1d665aae73da26a1fc0d143a22a9d Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Thu, 7 Jun 2018 19:19:13 +0200 Subject: [PATCH 1/4] Fix glm presence checking by autotools --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac1ee025d..531f545ee 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT AC_PROG_CXX +AC_LANG(C++) AC_CONFIG_MACRO_DIRS([m4 m4/autoconf-archive]) AX_CHECK_GL @@ -65,7 +66,7 @@ AS_IF([test "x$enable_ftgl" = "xyes"], [ AC_DEFINE([USE_FTGL], [1], [Define USE_FTGL]) ]) -PKG_CHECK_MODULES(glm, [glm], [], [AC_MSG_ERROR([libglm is required.])]) +AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(libglm is required.)) AC_ARG_ENABLE([gles], AS_HELP_STRING([--enable-gles], [OpenGL ES support]), From c1f71d3bb31714f5d3157fa73d64d8aaa626bb94 Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Thu, 7 Jun 2018 19:46:24 +0200 Subject: [PATCH 2/4] Forgot to add libglm...again --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8235a6e95..aad7b104d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ matrix: - libftgl-dev - libsdl2-dev - libdevil-dev + - libglm-dev env: - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" # linux/gcc @@ -51,6 +52,7 @@ matrix: - libftgl-dev - libsdl2-dev - libdevil-dev + - libglm-dev env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" From 0bb9903afdc5d55e410953ec685937fe98457f69 Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Fri, 8 Jun 2018 07:07:33 +0200 Subject: [PATCH 3/4] Move optional gl32.h which is only used for GL debug --- src/libprojectM/projectM-opengl.h | 1 - src/projectM-sdl/projectM_SDL_main.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h index 651cb35ea..d950cd587 100644 --- a/src/libprojectM/projectM-opengl.h +++ b/src/libprojectM/projectM-opengl.h @@ -12,7 +12,6 @@ #else /* linux/unix/other */ # ifdef USE_GLES # include -# include # else # if !defined(GL_GLEXT_PROTOTYPES) # define GL_GLEXT_PROTOTYPES diff --git a/src/projectM-sdl/projectM_SDL_main.cpp b/src/projectM-sdl/projectM_SDL_main.cpp index a18b346d0..0f4eda235 100644 --- a/src/projectM-sdl/projectM_SDL_main.cpp +++ b/src/projectM-sdl/projectM_SDL_main.cpp @@ -11,6 +11,8 @@ #define OGL_DEBUG 0 #if OGL_DEBUG +#include + void DebugLog(GLenum source, GLenum type, GLuint id, From a75c6aa67fd74ee80d064d8ad40fad839c32518b Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Fri, 8 Jun 2018 07:18:07 +0200 Subject: [PATCH 4/4] FTGL doesn't support modern OpenGL: disabling --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aad7b104d..88af5ae9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ before_install: # TODO: test different combinations of flags, --enable-sdl, --enable-qt, etc script: - - ./configure --enable-sdl --enable-ftgl --prefix=$PWD/local && make -j8 && make install # build from checkout - - make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --enable-ftgl --prefix=$PWD/dist_install && make -j8 && make install # build from dist + - ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install # build from checkout + - make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --prefix=$PWD/dist_install && make -j8 && make install # build from dist - echo "PWD $PWD" - ls . - test -e src/projectM-sdl/projectMSDL