Skip to content

Commit

Permalink
glew removal attempts
Browse files Browse the repository at this point in the history
projectm source needs to be build with 0001-hacky-removal-of-glew.patch

use the projectm 2.1 tar ball from source forge, apply the patch from
top with -p1, then build and install in src/libprojectm
  • Loading branch information
akva2 committed Feb 3, 2017
1 parent 857cff9 commit 75cc47e
Showing 1 changed file with 83 additions and 0 deletions.
83 changes: 83 additions & 0 deletions 0001-hacky-removal-of-glew.patch
@@ -0,0 +1,83 @@
From 7a122932630e3152a9d07adb5544655f809db1c9 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 18 Jan 2017 12:30:49 +0100
Subject: [PATCH] hacky removal of glew

---
src/libprojectM/CMakeLists.txt | 4 ++--
src/libprojectM/Renderer/CMakeLists.txt | 2 +-
src/libprojectM/Renderer/FBO.cpp | 4 ++--
src/libprojectM/Renderer/FBO.hpp | 5 ++++-
4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 065eb06..faaded8 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -196,7 +196,7 @@ if(BUILD_PROJECTM_STATIC)
${IMAGE_LINK_TARGETS}
${CG_LINK_TARGETS}
${PRESET_FACTORY_LINK_TARGETS}
- ${GLEW_LIBRARY}
+ #${GLEW_LIBRARY}
${FTGL_LINK_TARGETS}
${MATH_LIBRARIES}
dl
@@ -207,7 +207,7 @@ else(BUILD_PROJECTM_STATIC)
${IMAGE_LINK_TARGETS}
${CG_LINK_TARGETS}
${PRESET_FACTORY_LINK_TARGETS}
- ${GLEW_LIBRARY}
+ #${GLEW_LIBRARY}
${FTGL_LINK_TARGETS}
${MATH_LIBRARIES}
dl
diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt
index 90ba22c..f80b5bd 100644
--- a/src/libprojectM/Renderer/CMakeLists.txt
+++ b/src/libprojectM/Renderer/CMakeLists.txt
@@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})

ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES}
- ${GLEW_LINK_TARGETS}
+ #${GLEW_LINK_TARGETS}
${FTGL_LINK_TARGETS}
${OPENGL_LIBRARIES}
${IMAGE_LINK_TARGETS}
diff --git a/src/libprojectM/Renderer/FBO.cpp b/src/libprojectM/Renderer/FBO.cpp
index fac2408..5c9139b 100755
--- a/src/libprojectM/Renderer/FBO.cpp
+++ b/src/libprojectM/Renderer/FBO.cpp
@@ -97,10 +97,10 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : useFBO(false) {
this->texsize = texsize;

#ifdef USE_FBO
- glewInit();
+ //glewInit();
// Forceably disable FBO if user requested it but the video card / driver lacks
// the appropraite frame buffer extension.
- if (useFBO = glewIsSupported("GL_EXT_framebuffer_object"))
+ if (useFBO = 1)//glewIsSupported("GL_EXT_framebuffer_object"))
{

GLuint fb, depth_rb, rgba_tex, other_tex;
diff --git a/src/libprojectM/Renderer/FBO.hpp b/src/libprojectM/Renderer/FBO.hpp
index e79954d..3844f24 100755
--- a/src/libprojectM/Renderer/FBO.hpp
+++ b/src/libprojectM/Renderer/FBO.hpp
@@ -32,7 +32,10 @@
#ifdef USE_NATIVE_GLEW
#include "glew.h"
#else
-#include <GL/glew.h>
+//#include <GL/glew.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
#endif
#endif

--
2.7.4

0 comments on commit 75cc47e

Please sign in to comment.