diff --git a/CMakeLists.txt b/CMakeLists.txt index 5deeb804c..68e72d700 100644 --- 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 deleted file mode 100644 index 9927858a8..000000000 --- a/FindGLEW.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# - Try to find GLEW -# Once done this will define -# -# GLEW_FOUND - system has libGLEW -# GLEW_INCLUDE_DIRS - the libGLEW include directory -# GLEW_LIBRARIES - The libGLEW libraries - -if(PKG_CONFIG_FOUND) - pkg_check_modules (GLEW glew) -endif() - -if(NOT GLEW_FOUND) - find_path(GLEW_INCLUDE_DIRS GL/glew.h) - find_library(GLEW_LIBRARIES GLEW) -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES) - -mark_as_advanced(GLEW_INCLUDE_DIRS GLEW_LIBRARIES) diff --git a/debian/control b/debian/control index e21dde987..4412cbf84 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: kodi-visualization-goom Priority: extra Maintainer: Arne Morten Kvarving 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 index 4e173c972..ef34a0636 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -28,7 +28,7 @@ Goom Visualization Interface for XBMC #define __STDC_LIMIT_MACROS -#include +#include #include #include #include