Merge pull request #3 from notspiff/nuke_glew

Nuke glew
xbmc · Oct 28, 2015 · b5e1414 · b5e1414
2 parents a559815 + b5328fe
commit b5e1414
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 find_package(kodi REQUIRED)
 
 find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
 include_directories(${OpenGL_INCLUDE_DIR}
-                    ${GLEW_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR}
                     ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src)
 
@@ -27,7 +25,6 @@ externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0
 set(GOOM_SOURCES src/Main.cpp)
 
 set(DEPLIBS ${OPENGL_LIBRARIES}
-            ${GLEW_LIBRARIES}
             ${CMAKE_BINARY_DIR}/libgoom-prefix/src/libgoom-build/src/.libs/libgoom2.a)
 
 build_addon(visualization.goom GOOM DEPLIBS)

diff --git a/FindGLEW.cmake b/FindGLEW.cmake
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-visualization-goom
 Priority: extra
 Maintainer: Arne Morten Kvarving <spiff@xbmc.org>
 Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev,
-               kodi-visualization-dev, libgl1-mesa-dev, libglew-dev,
+               kodi-visualization-dev, libgl1-mesa-dev,
                automake, autoconf, libtool
 Standards-Version: 3.9.2
 Section: libs

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -28,7 +28,7 @@ Goom Visualization Interface for XBMC
 
 #define __STDC_LIMIT_MACROS
 
-#include <kodi/xbmc_vis_dll.h>
+#include <xbmc_vis_dll.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>