libgprojectM: hacky removal of glew (spiff)

This commit is contained in:
MilhouseVH 2017-02-20 02:15:52 +00:00
parent 6f8718d27c
commit 2bde52b609

View File

@ -0,0 +1,61 @@
From 8d450df7830744201f4527a275989124ce1f48f2 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 19 Jan 2017 11:23:38 +0100
Subject: [PATCH] hacky removal of glew
---
CMakeLists.txt | 3 ++-
Renderer/FBO.cpp | 4 ++--
Renderer/FBO.hpp | 5 ++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d8e90e..3492101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,8 @@ SET(GLEW_SOURCES glew.h glew.c)
SET(GLEW_LINK_TARGETS )
else(USE_NATIVE_GLEW)
SET(GLEW_SOURCES )
-SET (GLEW_LINK_TARGETS GLEW)
+#SET (GLEW_LINK_TARGETS GLEW)
+SET (GLEW_LINK_TARGETS)
endif(USE_NATIVE_GLEW)
SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp
diff --git a/Renderer/FBO.cpp b/Renderer/FBO.cpp
index 97e482a..20f50dd 100755
--- a/Renderer/FBO.cpp
+++ b/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/Renderer/FBO.hpp b/Renderer/FBO.hpp
index e79954d..3844f24 100755
--- a/Renderer/FBO.hpp
+++ b/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