diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-10-02 21:09:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-10-02 21:09:39 +0400 |
| commit | 07ad83a4398473da1a5f32607f64cd6cdfaa72a3 (patch) | |
| tree | 923a0d8f374b422adda0dcb2dcc1a09b8d429168 /CMakeLists.txt | |
| parent | 71f772a0ed18daf3ea1729e4568a21320d2c1986 (diff) | |
* Removing libsamplerate from build systems
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24f5360f353..405c8850504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,6 @@ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org option(WITH_SDL "Enable SDL for sound and joystick support" ON) option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF) -option(WITH_SAMPLERATE "Enable samplerate conversion" ON) # Compression option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON) @@ -447,13 +446,6 @@ if(UNIX AND NOT APPLE) endif() endif() - if(WITH_SAMPLERATE) - find_package(Samplerate) - if(NOT SAMPLERATE_FOUND) - set(WITH_SAMPLERATE OFF) - endif() - endif() - if(WITH_OPENCOLLADA) find_package(OpenCOLLADA) if(OPENCOLLADA_FOUND) @@ -565,13 +557,6 @@ elseif(WIN32) set(ICONV_LIBPATH ${ICONV}/lib) endif() - if(WITH_SAMPLERATE) - set(SAMPLERATE ${LIBDIR}/samplerate) - set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include) - set(SAMPLERATE_LIBRARIES libsamplerate) - set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib) - endif() - set(PNG "${LIBDIR}/png") set(PNG_INCLUDE_DIR "${PNG}/include") set(PNG_LIBPATH ${PNG}/lib) # not cmake defined @@ -995,13 +980,6 @@ elseif(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS") endif() - if(WITH_SAMPLERATE) - set(SAMPLERATE ${LIBDIR}/samplerate) - set(SAMPLERATE_INCLUDE_DIRS ${SAMPLERATE}/include) - set(SAMPLERATE_LIBRARIES samplerate) - set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib) - endif() - find_library(SYSTEMSTUBS_LIBRARY NAMES SystemStubs @@ -1436,7 +1414,6 @@ if(FIRST_RUN) info_cfg_option(WITH_JACK) info_cfg_option(WITH_CODEC_FFMPEG) info_cfg_option(WITH_CODEC_SNDFILE) - info_cfg_option(WITH_SAMPLERATE) info_cfg_text("Compression:") info_cfg_option(WITH_LZMA) |