Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Statically link gverb

Browse source
This commit is contained in:
Atlante45 2014-10-22 12:56:44 -07:00
parent e496304f7e
commit ccc8e0d876
4 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmake/modules/FindGverb.cmake
View file

@ -19,20 +19,21 @@ if (GVERB_INCLUDE_DIRS)
# in cache already # in cache already
set(GVERB_FOUND TRUE) set(GVERB_FOUND TRUE)
else () else ()
find_path(GVERB_INCLUDE_DIRS gverb.h ${GVERB_ROOT_DIR}/include)
include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
hifi_library_search_hints("gverb")
find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_DIRS})
find_path(GVERB_SRC_DIRS gverb.c PATH_SUFFIXES src HINTS ${GVERB_SEARCH_DIRS})
if (GVERB_INCLUDE_DIRS) if (GVERB_INCLUDE_DIRS)
set(GVERB_FOUND TRUE) set(GVERB_FOUND TRUE)
endif (GVERB_INCLUDE_DIRS) endif (GVERB_INCLUDE_DIRS)
if (GVERB_FOUND) if (GVERB_FOUND)
if (NOT GVERB_FIND_QUIETLY)
message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}") message(STATUS "Found Gverb: ${GVERB_INCLUDE_DIRS}")
endif (NOT GVERB_FIND_QUIETLY)
else () else ()
if (GVERB_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find Gverb. Read ./interface/externals/gverb/readme.txt")
message(FATAL_ERROR "Could NOT find Gverb")
endif (GVERB_FIND_REQUIRED)
endif () endif ()
endif () endif ()

14
interface/CMakeLists.txt
View file

@ -14,9 +14,17 @@ endforeach()
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5LinguistToolsMacros) find_package(Qt5LinguistToolsMacros)
# As Gverb is currently the only reverb library, it's required. # As Gverb is currently the only reverb library, it's required.
find_package(Gverb REQUIRED) find_package(Gverb REQUIRED)
if (GVERB_FOUND)
file(GLOB GVERB_SRCS ${GVERB_SRC_DIRS}/*.c)
include_directories(${GVERB_INCLUDE_DIRS})
add_library(Gverb ${GVERB_SRCS})
message(STATUS "Gverb srcs: ${GVERB_SRCS}")
endif (GVERB_FOUND)
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set(BUILD_SEQ $ENV{JOB_ID}) set(BUILD_SEQ $ENV{JOB_ID})
else () else ()
@ -169,12 +177,6 @@ if (QXMPP_FOUND AND NOT DISABLE_QXMPP AND WIN32)
add_definitions(-DQXMPP_STATIC) add_definitions(-DQXMPP_STATIC)
endif () endif ()
if (GVERB_FOUND)
add_subdirectory(${GVERB_ROOT_DIR})
include_directories(${GVERB_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} gverb)
endif (GVERB_FOUND)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes") include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")

11
interface/external/gverb/CMakeLists.txt vendored
View file

@ -1,11 +0,0 @@
cmake_minimum_required(VERSION 2.8)
set(TARGET_NAME gverb)
project(${TARGET_NAME})
# grab the implementation and header files
file(GLOB GVERB_SRCS src/*.c)
include_directories(include)
add_library(${TARGET_NAME} ${GVERB_SRCS})

1
interface/src/Audio.h
View file

@ -49,6 +49,7 @@
extern "C" { extern "C" {
#include <gverb.h> #include <gverb.h>
#include <gverbdsp.h>
} }
static const int NUM_AUDIO_CHANNELS = 2; static const int NUM_AUDIO_CHANNELS = 2;