Merge pull request #69 from deltaoscarmike/gles3

OpenGL ES 3.0 support

.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

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]),

src/libprojectM/projectM-opengl.h

@@ -16,7 +16,6 @@
 #else /* linux/unix/other */
 # ifdef USE_GLES
 #  include <GLES3/gl3.h>
-#  include <GLES3/gl32.h>
 # else
 #  if !defined(GL_GLEXT_PROTOTYPES)
 #     define GL_GLEXT_PROTOTYPES

src/projectM-sdl/projectM_SDL_main.cpp

@@ -11,6 +11,8 @@
 #define OGL_DEBUG	0
 
 #if OGL_DEBUG
+#include <GLES3/gl32.h>
+
 void DebugLog(GLenum source,
                GLenum type,
                GLuint id,