diff options
Diffstat (limited to 'extern')
-rw-r--r-- | extern/CMakeLists.txt | 62 | ||||
-rw-r--r-- | extern/audaspace/CMakeLists.txt | 1492 | ||||
-rw-r--r-- | extern/audaspace/blender_config.cmake | 2 | ||||
-rw-r--r-- | extern/binreloc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/bullet2/CMakeLists.txt | 746 | ||||
-rw-r--r-- | extern/ceres/CMakeLists.txt | 552 | ||||
-rwxr-xr-x | extern/ceres/bundle.sh | 40 | ||||
-rw-r--r-- | extern/clew/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/cuew/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/curve_fit_nd/CMakeLists.txt | 18 | ||||
-rw-r--r-- | extern/draco/dracoenc/CMakeLists.txt | 352 | ||||
-rw-r--r-- | extern/gflags/CMakeLists.txt | 34 | ||||
-rw-r--r-- | extern/glew-es/CMakeLists.txt | 20 | ||||
-rw-r--r-- | extern/glew/CMakeLists.txt | 18 | ||||
-rw-r--r-- | extern/glog/CMakeLists.txt | 118 | ||||
-rw-r--r-- | extern/gtest/CMakeLists.txt | 66 | ||||
-rw-r--r-- | extern/lzma/CMakeLists.txt | 26 | ||||
-rw-r--r-- | extern/lzo/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/rangetree/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/sdlew/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/wcwidth/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/xdnd/CMakeLists.txt | 10 |
22 files changed, 1804 insertions, 1804 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 450f5e64351..3b2a8c172aa 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -26,9 +26,9 @@ remove_strict_flags() # Not a strict flag, but noisy for code we don't maintain if(CMAKE_COMPILER_IS_GNUCC) - remove_cc_flag( - "-Wmisleading-indentation" - ) + remove_cc_flag( + "-Wmisleading-indentation" + ) endif() @@ -36,72 +36,72 @@ add_subdirectory(rangetree) add_subdirectory(wcwidth) if(WITH_BULLET) - if(NOT WITH_SYSTEM_BULLET) - add_subdirectory(bullet2) - endif() + if(NOT WITH_SYSTEM_BULLET) + add_subdirectory(bullet2) + endif() endif() if(WITH_DRACO) - add_subdirectory(draco) + add_subdirectory(draco) endif() # now only available in a branch #if(WITH_MOD_CLOTH_ELTOPO) -# add_subdirectory(eltopo) +# add_subdirectory(eltopo) #endif() if(WITH_BINRELOC) - add_subdirectory(binreloc) + add_subdirectory(binreloc) endif() if(NOT WITH_SYSTEM_GLEW) - if(WITH_GLEW_ES) - add_subdirectory(glew-es) - else() - add_subdirectory(glew) - endif() + if(WITH_GLEW_ES) + add_subdirectory(glew-es) + else() + add_subdirectory(glew) + endif() endif() if(WITH_LZO AND NOT WITH_SYSTEM_LZO) - add_subdirectory(lzo) + add_subdirectory(lzo) endif() if(WITH_LZMA) - add_subdirectory(lzma) + add_subdirectory(lzma) endif() if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV) - add_subdirectory(clew) - if(WITH_CUDA_DYNLOAD) - add_subdirectory(cuew) - endif() + add_subdirectory(clew) + if(WITH_CUDA_DYNLOAD) + add_subdirectory(cuew) + endif() endif() if(WITH_X11 AND WITH_GHOST_XDND) - add_subdirectory(xdnd) + add_subdirectory(xdnd) endif() if(WITH_LIBMV) - add_subdirectory(ceres) + add_subdirectory(ceres) endif() if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) - if(NOT WITH_SYSTEM_GFLAGS) - add_subdirectory(gflags) - endif() - add_subdirectory(glog) + if(NOT WITH_SYSTEM_GFLAGS) + add_subdirectory(gflags) + endif() + add_subdirectory(glog) endif() if(WITH_GTESTS) - add_subdirectory(gtest) - add_subdirectory(gmock) + add_subdirectory(gtest) + add_subdirectory(gmock) endif() if(WITH_SDL AND WITH_SDL_DYNLOAD) - add_subdirectory(sdlew) + add_subdirectory(sdlew) endif() if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) - set(AUDASPACE_CMAKE_CFG ${CMAKE_CURRENT_SOURCE_DIR}/audaspace/blender_config.cmake) - add_subdirectory(audaspace) + set(AUDASPACE_CMAKE_CFG ${CMAKE_CURRENT_SOURCE_DIR}/audaspace/blender_config.cmake) + add_subdirectory(audaspace) endif() diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt index c9f709b8c10..9e7592fd5f4 100644 --- a/extern/audaspace/CMakeLists.txt +++ b/extern/audaspace/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.0) include(CMakeDependentOption) if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) + cmake_policy(SET CMP0054 NEW) endif() project(audaspace) @@ -27,223 +27,223 @@ set(AUDASPACE_VERSION 1.3) set(AUDASPACE_LONG_VERSION ${AUDASPACE_VERSION}.0) if(DEFINED AUDASPACE_CMAKE_CFG) - include(${AUDASPACE_CMAKE_CFG}) + include(${AUDASPACE_CMAKE_CFG}) endif() if(NOT DEFINED AUDASPACE_STANDALONE) - set(AUDASPACE_STANDALONE TRUE) + set(AUDASPACE_STANDALONE TRUE) endif() # sources set(SRC - src/devices/DefaultSynchronizer.cpp - src/devices/DeviceManager.cpp - src/devices/NULLDevice.cpp - src/devices/ReadDevice.cpp - src/devices/SoftwareDevice.cpp - src/Exception.cpp - src/file/File.cpp - src/file/FileManager.cpp - src/file/FileWriter.cpp - src/fx/Accumulator.cpp - src/fx/ADSR.cpp - src/fx/ADSRReader.cpp - src/fx/BaseIIRFilterReader.cpp - src/fx/ButterworthCalculator.cpp - src/fx/Butterworth.cpp - src/fx/CallbackIIRFilterReader.cpp - src/fx/Delay.cpp - src/fx/DelayReader.cpp - src/fx/DynamicIIRFilter.cpp - src/fx/DynamicIIRFilterReader.cpp - src/fx/DynamicMusic.cpp - src/fx/Effect.cpp - src/fx/EffectReader.cpp - src/fx/Envelope.cpp - src/fx/Fader.cpp - src/fx/FaderReader.cpp - src/fx/HighpassCalculator.cpp - src/fx/Highpass.cpp - src/fx/IIRFilter.cpp - src/fx/IIRFilterReader.cpp - src/fx/Limiter.cpp - src/fx/LimiterReader.cpp - src/fx/Loop.cpp - src/fx/LoopReader.cpp - src/fx/LowpassCalculator.cpp - src/fx/Lowpass.cpp - src/fx/Modulator.cpp - src/fx/ModulatorReader.cpp - src/fx/MutableReader.cpp - src/fx/MutableSound.cpp - src/fx/Pitch.cpp - src/fx/PitchReader.cpp - src/fx/PlaybackManager.cpp - src/fx/PlaybackCategory.cpp - src/fx/Reverse.cpp - src/fx/ReverseReader.cpp - src/fx/SoundList.cpp - src/fx/Source.cpp - src/fx/Sum.cpp - src/fx/Threshold.cpp - src/fx/Volume.cpp - src/fx/VolumeReader.cpp - src/fx/VolumeSound.cpp - src/fx/VolumeStorage.cpp - src/generator/Sawtooth.cpp - src/generator/SawtoothReader.cpp - src/generator/Silence.cpp - src/generator/SilenceReader.cpp - src/generator/Sine.cpp - src/generator/SineReader.cpp - src/generator/Square.cpp - src/generator/SquareReader.cpp - src/generator/Triangle.cpp - src/generator/TriangleReader.cpp - src/respec/ChannelMapper.cpp - src/respec/ChannelMapperReader.cpp - src/respec/Converter.cpp - src/respec/ConverterFunctions.cpp - src/respec/ConverterReader.cpp - src/respec/JOSResample.cpp - src/respec/JOSResampleReaderCoeff.cpp - src/respec/JOSResampleReader.cpp - src/respec/LinearResample.cpp - src/respec/LinearResampleReader.cpp - src/respec/Mixer.cpp - src/respec/ResampleReader.cpp - src/respec/SpecsChanger.cpp - src/sequence/AnimateableProperty.cpp - src/sequence/Double.cpp - src/sequence/DoubleReader.cpp - src/sequence/PingPong.cpp - src/sequence/Sequence.cpp - src/sequence/SequenceData.cpp - src/sequence/SequenceEntry.cpp - src/sequence/SequenceHandle.cpp - src/sequence/SequenceReader.cpp - src/sequence/Superpose.cpp - src/sequence/SuperposeReader.cpp - src/util/Barrier.cpp - src/util/Buffer.cpp - src/util/BufferReader.cpp - src/util/StreamBuffer.cpp - src/util/ThreadPool.cpp + src/devices/DefaultSynchronizer.cpp + src/devices/DeviceManager.cpp + src/devices/NULLDevice.cpp + src/devices/ReadDevice.cpp + src/devices/SoftwareDevice.cpp + src/Exception.cpp + src/file/File.cpp + src/file/FileManager.cpp + src/file/FileWriter.cpp + src/fx/Accumulator.cpp + src/fx/ADSR.cpp + src/fx/ADSRReader.cpp + src/fx/BaseIIRFilterReader.cpp + src/fx/ButterworthCalculator.cpp + src/fx/Butterworth.cpp + src/fx/CallbackIIRFilterReader.cpp + src/fx/Delay.cpp + src/fx/DelayReader.cpp + src/fx/DynamicIIRFilter.cpp + src/fx/DynamicIIRFilterReader.cpp + src/fx/DynamicMusic.cpp + src/fx/Effect.cpp + src/fx/EffectReader.cpp + src/fx/Envelope.cpp + src/fx/Fader.cpp + src/fx/FaderReader.cpp + src/fx/HighpassCalculator.cpp + src/fx/Highpass.cpp + src/fx/IIRFilter.cpp + src/fx/IIRFilterReader.cpp + src/fx/Limiter.cpp + src/fx/LimiterReader.cpp + src/fx/Loop.cpp + src/fx/LoopReader.cpp + src/fx/LowpassCalculator.cpp + src/fx/Lowpass.cpp + src/fx/Modulator.cpp + src/fx/ModulatorReader.cpp + src/fx/MutableReader.cpp + src/fx/MutableSound.cpp + src/fx/Pitch.cpp + src/fx/PitchReader.cpp + src/fx/PlaybackManager.cpp + src/fx/PlaybackCategory.cpp + src/fx/Reverse.cpp + src/fx/ReverseReader.cpp + src/fx/SoundList.cpp + src/fx/Source.cpp + src/fx/Sum.cpp + src/fx/Threshold.cpp + src/fx/Volume.cpp + src/fx/VolumeReader.cpp + src/fx/VolumeSound.cpp + src/fx/VolumeStorage.cpp + src/generator/Sawtooth.cpp + src/generator/SawtoothReader.cpp + src/generator/Silence.cpp + src/generator/SilenceReader.cpp + src/generator/Sine.cpp + src/generator/SineReader.cpp + src/generator/Square.cpp + src/generator/SquareReader.cpp + src/generator/Triangle.cpp + src/generator/TriangleReader.cpp + src/respec/ChannelMapper.cpp + src/respec/ChannelMapperReader.cpp + src/respec/Converter.cpp + src/respec/ConverterFunctions.cpp + src/respec/ConverterReader.cpp + src/respec/JOSResample.cpp + src/respec/JOSResampleReaderCoeff.cpp + src/respec/JOSResampleReader.cpp + src/respec/LinearResample.cpp + src/respec/LinearResampleReader.cpp + src/respec/Mixer.cpp + src/respec/ResampleReader.cpp + src/respec/SpecsChanger.cpp + src/sequence/AnimateableProperty.cpp + src/sequence/Double.cpp + src/sequence/DoubleReader.cpp + src/sequence/PingPong.cpp + src/sequence/Sequence.cpp + src/sequence/SequenceData.cpp + src/sequence/SequenceEntry.cpp + src/sequence/SequenceHandle.cpp + src/sequence/SequenceReader.cpp + src/sequence/Superpose.cpp + src/sequence/SuperposeReader.cpp + src/util/Barrier.cpp + src/util/Buffer.cpp + src/util/BufferReader.cpp + src/util/StreamBuffer.cpp + src/util/ThreadPool.cpp ) set(PRIVATE_HDR - src/sequence/SequenceHandle.h + src/sequence/SequenceHandle.h ) set(PUBLIC_HDR - include/devices/DefaultSynchronizer.h - include/devices/DeviceManager.h - include/devices/I3DDevice.h - include/devices/I3DHandle.h - include/devices/IDeviceFactory.h - include/devices/IDevice.h - include/devices/IHandle.h - include/devices/ISynchronizer.h - include/devices/NULLDevice.h - include/devices/ReadDevice.h - include/devices/SoftwareDevice.h - include/Exception.h - include/file/File.h - include/file/FileManager.h - include/file/FileWriter.h - include/file/IFileInput.h - include/file/IFileOutput.h - include/file/IWriter.h - include/fx/Accumulator.h - include/fx/ADSR.h - include/fx/ADSRReader.h - include/fx/BaseIIRFilterReader.h - include/fx/ButterworthCalculator.h - include/fx/Butterworth.h - include/fx/CallbackIIRFilterReader.h - include/fx/Delay.h - include/fx/DelayReader.h - include/fx/DynamicIIRFilter.h - include/fx/DynamicIIRFilterReader.h - include/fx/DynamicMusic.h - include/fx/Effect.h - include/fx/EffectReader.h - include/fx/Envelope.h - include/fx/Fader.h - include/fx/FaderReader.h - include/fx/HighpassCalculator.h - include/fx/Highpass.h - include/fx/IDynamicIIRFilterCalculator.h - include/fx/IIRFilter.h - include/fx/IIRFilterReader.h - include/fx/Limiter.h - include/fx/LimiterReader.h - include/fx/Loop.h - include/fx/LoopReader.h - include/fx/LowpassCalculator.h - include/fx/Lowpass.h - include/fx/Modulator.h - include/fx/ModulatorReader.h - include/fx/MutableReader.h - include/fx/MutableSound.h - include/fx/Pitch.h - include/fx/PitchReader.h - include/fx/PlaybackManager.h - include/fx/PlaybackCategory.h - include/fx/Reverse.h - include/fx/ReverseReader.h - include/fx/SoundList.h - include/fx/Source.h - include/fx/Sum.h - include/fx/Threshold.h - include/fx/Volume.h - include/fx/VolumeReader.h - include/fx/VolumeSound.h - include/fx/VolumeStorage.h - include/generator/Sawtooth.h - include/generator/SawtoothReader.h - include/generator/Silence.h - include/generator/SilenceReader.h - include/generator/Sine.h - include/generator/SineReader.h - include/generator/Square.h - include/generator/SquareReader.h - include/generator/Triangle.h - include/generator/TriangleReader.h - include/IReader.h - include/ISound.h - include/plugin/PluginManager.h - include/respec/ChannelMapper.h - include/respec/ChannelMapperReader.h - include/respec/ConverterFunctions.h - include/respec/Converter.h - include/respec/ConverterReader.h - include/respec/JOSResample.h - include/respec/JOSResampleReader.h - include/respec/LinearResample.h - include/respec/LinearResampleReader.h - include/respec/Mixer.h - include/respec/ResampleReader.h - include/respec/Specification.h - include/respec/SpecsChanger.h - include/sequence/AnimateableProperty.h - include/sequence/Double.h - include/sequence/DoubleReader.h - include/sequence/PingPong.h - include/sequence/SequenceData.h - include/sequence/SequenceEntry.h - include/sequence/Sequence.h - include/sequence/SequenceReader.h - include/sequence/Superpose.h - include/sequence/SuperposeReader.h - include/util/Barrier.h - include/util/Buffer.h - include/util/BufferReader.h - include/util/ILockable.h - include/util/Math3D.h - include/util/StreamBuffer.h - include/util/ThreadPool.h + include/devices/DefaultSynchronizer.h + include/devices/DeviceManager.h + include/devices/I3DDevice.h + include/devices/I3DHandle.h + include/devices/IDeviceFactory.h + include/devices/IDevice.h + include/devices/IHandle.h + include/devices/ISynchronizer.h + include/devices/NULLDevice.h + include/devices/ReadDevice.h + include/devices/SoftwareDevice.h + include/Exception.h + include/file/File.h + include/file/FileManager.h + include/file/FileWriter.h + include/file/IFileInput.h + include/file/IFileOutput.h + include/file/IWriter.h + include/fx/Accumulator.h + include/fx/ADSR.h + include/fx/ADSRReader.h + include/fx/BaseIIRFilterReader.h + include/fx/ButterworthCalculator.h + include/fx/Butterworth.h + include/fx/CallbackIIRFilterReader.h + include/fx/Delay.h + include/fx/DelayReader.h + include/fx/DynamicIIRFilter.h + include/fx/DynamicIIRFilterReader.h + include/fx/DynamicMusic.h + include/fx/Effect.h + include/fx/EffectReader.h + include/fx/Envelope.h + include/fx/Fader.h + include/fx/FaderReader.h + include/fx/HighpassCalculator.h + include/fx/Highpass.h + include/fx/IDynamicIIRFilterCalculator.h + include/fx/IIRFilter.h + include/fx/IIRFilterReader.h + include/fx/Limiter.h + include/fx/LimiterReader.h + include/fx/Loop.h + include/fx/LoopReader.h + include/fx/LowpassCalculator.h + include/fx/Lowpass.h + include/fx/Modulator.h + include/fx/ModulatorReader.h + include/fx/MutableReader.h + include/fx/MutableSound.h + include/fx/Pitch.h + include/fx/PitchReader.h + include/fx/PlaybackManager.h + include/fx/PlaybackCategory.h + include/fx/Reverse.h + include/fx/ReverseReader.h + include/fx/SoundList.h + include/fx/Source.h + include/fx/Sum.h + include/fx/Threshold.h + include/fx/Volume.h + include/fx/VolumeReader.h + include/fx/VolumeSound.h + include/fx/VolumeStorage.h + include/generator/Sawtooth.h + include/generator/SawtoothReader.h + include/generator/Silence.h + include/generator/SilenceReader.h + include/generator/Sine.h + include/generator/SineReader.h + include/generator/Square.h + include/generator/SquareReader.h + include/generator/Triangle.h + include/generator/TriangleReader.h + include/IReader.h + include/ISound.h + include/plugin/PluginManager.h + include/respec/ChannelMapper.h + include/respec/ChannelMapperReader.h + include/respec/ConverterFunctions.h + include/respec/Converter.h + include/respec/ConverterReader.h + include/respec/JOSResample.h + include/respec/JOSResampleReader.h + include/respec/LinearResample.h + include/respec/LinearResampleReader.h + include/respec/Mixer.h + include/respec/ResampleReader.h + include/respec/Specification.h + include/respec/SpecsChanger.h + include/sequence/AnimateableProperty.h + include/sequence/Double.h + include/sequence/DoubleReader.h + include/sequence/PingPong.h + include/sequence/SequenceData.h + include/sequence/SequenceEntry.h + include/sequence/Sequence.h + include/sequence/SequenceReader.h + include/sequence/Superpose.h + include/sequence/SuperposeReader.h + include/util/Barrier.h + include/util/Buffer.h + include/util/BufferReader.h + include/util/ILockable.h + include/util/Math3D.h + include/util/StreamBuffer.h + include/util/ThreadPool.h ) set(HDR ${PRIVATE_HDR} ${PUBLIC_HDR}) @@ -251,15 +251,15 @@ set(HDR ${PRIVATE_HDR} ${PUBLIC_HDR}) set(INCLUDE ${CMAKE_CURRENT_BINARY_DIR} include) if(WIN32) - set(LIBRARIES) - if(AUDASPACE_STANDALONE) - set(DLLS) - set(LIBRARY_PATH "../lib" CACHE PATH "Path which contains the libraries.") - file(GLOB LIBRARY_DIRS ${LIBRARY_PATH}/*) - list(APPEND CMAKE_PREFIX_PATH ${LIBRARY_DIRS}) - endif() + set(LIBRARIES) + if(AUDASPACE_STANDALONE) + set(DLLS) + set(LIBRARY_PATH "../lib" CACHE PATH "Path which contains the libraries.") + file(GLOB LIBRARY_DIRS ${LIBRARY_PATH}/*) + list(APPEND CMAKE_PREFIX_PATH ${LIBRARY_DIRS}) + endif() else() - set(LIBRARIES ${CMAKE_DL_LIBS} -lpthread) + set(LIBRARIES ${CMAKE_DL_LIBS} -lpthread) endif() set(STATIC_PLUGINS "") @@ -267,418 +267,418 @@ set(STATIC_PLUGINS "") # dependencies if(AUDASPACE_STANDALONE) - set(PACKAGE_OPTION QUIET) - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") + set(PACKAGE_OPTION QUIET) + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") - option(BUILD_DEMOS "Build and install demos" TRUE) + option(BUILD_DEMOS "Build and install demos" TRUE) - option(SHARED_LIBRARY "Build Shared Library" TRUE) + option(SHARED_LIBRARY "Build Shared Library" TRUE) - option(WITH_C "Build C Module" TRUE) - option(WITH_DOCS "Build C++ HTML Documentation with Doxygen" TRUE) - option(WITH_FFMPEG "Build With FFMPEG" TRUE) - option(WITH_FFTW "Build With FFTW" TRUE) - option(WITH_JACK "Build With Plugin" TRUE) - option(WITH_LIBSNDFILE "Build With LibSndFile" TRUE) - option(WITH_OPENAL "Build With OpenAL" TRUE) - option(WITH_PYTHON "Build With Python Library" TRUE) - option(WITH_SDL "Build With SDL" TRUE) - option(WITH_STRICT_DEPENDENCIES "Error and abort instead of warning if a library is not found." FALSE) + option(WITH_C "Build C Module" TRUE) + option(WITH_DOCS "Build C++ HTML Documentation with Doxygen" TRUE) + option(WITH_FFMPEG "Build With FFMPEG" TRUE) + option(WITH_FFTW "Build With FFTW" TRUE) + option(WITH_JACK "Build With Plugin" TRUE) + option(WITH_LIBSNDFILE "Build With LibSndFile" TRUE) + option(WITH_OPENAL "Build With OpenAL" TRUE) + option(WITH_PYTHON "Build With Python Library" TRUE) + option(WITH_SDL "Build With SDL" TRUE) + option(WITH_STRICT_DEPENDENCIES "Error and abort instead of warning if a library is not found." FALSE) - if(WITH_STRICT_DEPENDENCIES) - set(PACKAGE_OPTION REQUIRED) - endif() + if(WITH_STRICT_DEPENDENCIES) + set(PACKAGE_OPTION REQUIRED) + endif() endif() if(WIN32) - set(DEFAULT_PLUGIN_PATH "." CACHE STRING "Default plugin installation and loading path.") - set(DOCUMENTATION_INSTALL_PATH "doc" CACHE PATH "Path where the documentation is installed.") + set(DEFAULT_PLUGIN_PATH "." CACHE STRING "Default plugin installation and loading path.") + set(DOCUMENTATION_INSTALL_PATH "doc" CACHE PATH "Path where the documentation is installed.") else() - set(DEFAULT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/share/audaspace/plugins" CACHE STRING "Default plugin installation and loading path.") - set(DOCUMENTATION_INSTALL_PATH "share/doc/audaspace" CACHE PATH "Path where the documentation is installed.") + set(DEFAULT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/share/audaspace/plugins" CACHE STRING "Default plugin installation and loading path.") + set(DOCUMENTATION_INSTALL_PATH "share/doc/audaspace" CACHE PATH "Path where the documentation is installed.") endif() if(AUDASPACE_STANDALONE) - cmake_dependent_option(SEPARATE_C "Build C Binding as separate library" TRUE "WITH_C" FALSE) - cmake_dependent_option(PLUGIN_FFMPEG "Build FFMPEG Plugin" TRUE "WITH_FFMPEG;SHARED_LIBRARY" FALSE) - cmake_dependent_option(PLUGIN_JACK "Build JACK Plugin" TRUE "WITH_JACK;SHARED_LIBRARY" FALSE) - cmake_dependent_option(PLUGIN_LIBSNDFILE "Build LibSndFile Plugin" TRUE "WITH_LIBSNDFILE;SHARED_LIBRARY" FALSE) - cmake_dependent_option(PLUGIN_OPENAL "Build OpenAL Plugin" TRUE "WITH_OPENAL;SHARED_LIBRARY" FALSE) - cmake_dependent_option(PLUGIN_SDL "Build SDL Plugin" TRUE "WITH_SDL;SHARED_LIBRARY" FALSE) - cmake_dependent_option(WITH_PYTHON_MODULE "Build Python Module" TRUE "WITH_PYTHON" FALSE) - cmake_dependent_option(USE_SDL2 "Use SDL2 instead of 1 if available" TRUE "WITH_SDL" FALSE) - cmake_dependent_option(DYNLOAD_JACK "Dynamically load JACK" FALSE "WITH_JACK" FALSE) - cmake_dependent_option(WITH_BINDING_DOCS "Build C/Python HTML Documentation with Sphinx" TRUE "WITH_PYTHON_MODULE" FALSE) + cmake_dependent_option(SEPARATE_C "Build C Binding as separate library" TRUE "WITH_C" FALSE) + cmake_dependent_option(PLUGIN_FFMPEG "Build FFMPEG Plugin" TRUE "WITH_FFMPEG;SHARED_LIBRARY" FALSE) + cmake_dependent_option(PLUGIN_JACK "Build JACK Plugin" TRUE "WITH_JACK;SHARED_LIBRARY" FALSE) + cmake_dependent_option(PLUGIN_LIBSNDFILE "Build LibSndFile Plugin" TRUE "WITH_LIBSNDFILE;SHARED_LIBRARY" FALSE) + cmake_dependent_option(PLUGIN_OPENAL "Build OpenAL Plugin" TRUE "WITH_OPENAL;SHARED_LIBRARY" FALSE) + cmake_dependent_option(PLUGIN_SDL "Build SDL Plugin" TRUE "WITH_SDL;SHARED_LIBRARY" FALSE) + cmake_dependent_option(WITH_PYTHON_MODULE "Build Python Module" TRUE "WITH_PYTHON" FALSE) + cmake_dependent_option(USE_SDL2 "Use SDL2 instead of 1 if available" TRUE "WITH_SDL" FALSE) + cmake_dependent_option(DYNLOAD_JACK "Dynamically load JACK" FALSE "WITH_JACK" FALSE) + cmake_dependent_option(WITH_BINDING_DOCS "Build C/Python HTML Documentation with Sphinx" TRUE "WITH_PYTHON_MODULE" FALSE) endif() # compiler options if(AUDASPACE_STANDALONE) - if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - add_definitions(-std=c++11) - list(APPEND CMAKE_C_COMPILER_FLAGS "-fvisibility=hidden") - list(APPEND CMAKE_CXX_COMPILER_FLAGS "-fvisibility=hidden") - endif() + if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + add_definitions(-std=c++11) + list(APPEND CMAKE_C_COMPILER_FLAGS "-fvisibility=hidden") + list(APPEND CMAKE_CXX_COMPILER_FLAGS "-fvisibility=hidden") + endif() - if(MSVC) - list(APPEND CMAKE_C_FLAGS_DEBUG "/Zi /Od") - list(APPEND CMAKE_CXX_FLAGS_DEBUG "/Zi /Od") - list(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG "/DEBUG") - list(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG "/DEBUG") - list(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG") + if(MSVC) + list(APPEND CMAKE_C_FLAGS_DEBUG "/Zi /Od") + list(APPEND CMAKE_CXX_FLAGS_DEBUG "/Zi /Od") + list(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG "/DEBUG") + list(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG "/DEBUG") + list(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG") - if(SHARED_LIBRARY) - include(GenerateExportHeader) - endif() - endif() + if(SHARED_LIBRARY) + include(GenerateExportHeader) + endif() + endif() - if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE) - endif() + if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE) + endif() endif() if(MSVC) - add_definitions( - /D_USE_MATH_DEFINES - /EHsc - /DNOMINMAX - /D_STDINT_H - ) + add_definitions( + /D_USE_MATH_DEFINES + /EHsc + /DNOMINMAX + /D_STDINT_H + ) endif() # platform specific options if(MSYS OR MINGW) - add_definitions(-D_USE_MATH_DEFINES) + add_definitions(-D_USE_MATH_DEFINES) endif() # C if(WITH_C) - set(C_SRC - bindings/C/AUD_ThreadPool.cpp - bindings/C/AUD_Source.cpp - bindings/C/AUD_Device.cpp - bindings/C/AUD_DynamicMusic.cpp - bindings/C/AUD_Handle.cpp - bindings/C/AUD_PlaybackManager.cpp - bindings/C/AUD_Sequence.cpp - bindings/C/AUD_Sound.cpp - bindings/C/AUD_Special.cpp - ) - set(C_HDR - bindings/C/AUD_ThreadPool.h - bindings/C/AUD_Source.h - bindings/C/AUD_Device.h - bindings/C/AUD_DynamicMusic.h - bindings/C/AUD_Handle.h - bindings/C/AUD_PlaybackManager.h - bindings/C/AUD_Sequence.h - bindings/C/AUD_Sound.h - bindings/C/AUD_Special.h - bindings/C/AUD_Types.h - ) + set(C_SRC + bindings/C/AUD_ThreadPool.cpp + bindings/C/AUD_Source.cpp + bindings/C/AUD_Device.cpp + bindings/C/AUD_DynamicMusic.cpp + bindings/C/AUD_Handle.cpp + bindings/C/AUD_PlaybackManager.cpp + bindings/C/AUD_Sequence.cpp + bindings/C/AUD_Sound.cpp + bindings/C/AUD_Special.cpp + ) + set(C_HDR + bindings/C/AUD_ThreadPool.h + bindings/C/AUD_Source.h + bindings/C/AUD_Device.h + bindings/C/AUD_DynamicMusic.h + bindings/C/AUD_Handle.h + bindings/C/AUD_PlaybackManager.h + bindings/C/AUD_Sequence.h + bindings/C/AUD_Sound.h + bindings/C/AUD_Special.h + bindings/C/AUD_Types.h + ) if(WITH_FFTW) - list(APPEND C_SRC - bindings/C/AUD_HRTF.cpp - bindings/C/AUD_ImpulseResponse.cpp - ) + list(APPEND C_SRC + bindings/C/AUD_HRTF.cpp + bindings/C/AUD_ImpulseResponse.cpp + ) - list(APPEND C_HDR - bindings/C/AUD_HRTF.h - bindings/C/AUD_ImpulseResponse.h - ) - endif() + list(APPEND C_HDR + bindings/C/AUD_HRTF.h + bindings/C/AUD_ImpulseResponse.h + ) + endif() - if(NOT SEPARATE_C) - list(APPEND SRC ${C_SRC}) - list(APPEND HDR ${C_HDR}) - else() - set(AUDASPACE_C_LIBRARY -laudaspace-c) - endif() + if(NOT SEPARATE_C) + list(APPEND SRC ${C_SRC}) + list(APPEND HDR ${C_HDR}) + else() + set(AUDASPACE_C_LIBRARY -laudaspace-c) + endif() endif() # FFMPEG if(WITH_FFMPEG) - if(AUDASPACE_STANDALONE) - find_package(FFMPEG ${PACKAGE_OPTION}) - endif() - - if(FFMPEG_FOUND) - set(FFMPEG_SRC - plugins/ffmpeg/FFMPEG.cpp - plugins/ffmpeg/FFMPEGReader.cpp - plugins/ffmpeg/FFMPEGWriter.cpp - ) - set(FFMPEG_HDR - plugins/ffmpeg/FFMPEG.h - plugins/ffmpeg/FFMPEGReader.h - plugins/ffmpeg/FFMPEGWriter.h - ) - - if(NOT PLUGIN_FFMPEG) - list(APPEND INCLUDE ${FFMPEG_INCLUDE_DIRS}) - list(APPEND LIBRARIES ${FFMPEG_LIBRARIES}) - list(APPEND SRC ${FFMPEG_SRC}) - list(APPEND HDR ${FFMPEG_HDR}) - list(APPEND STATIC_PLUGINS FFMPEG) - endif() - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB FFMPEG_DLLS ${LIBRARY_PATH}/ffmpeg/bin/*.dll) - list(APPEND DLLS ${FFMPEG_DLLS}) - endif() - else() - set(WITH_FFMPEG FALSE CACHE BOOL "Build With FFMPEG" FORCE) - message(WARNING "FFMPEG not found, plugin will not be built.") - endif() + if(AUDASPACE_STANDALONE) + find_package(FFMPEG ${PACKAGE_OPTION}) + endif() + + if(FFMPEG_FOUND) + set(FFMPEG_SRC + plugins/ffmpeg/FFMPEG.cpp + plugins/ffmpeg/FFMPEGReader.cpp + plugins/ffmpeg/FFMPEGWriter.cpp + ) + set(FFMPEG_HDR + plugins/ffmpeg/FFMPEG.h + plugins/ffmpeg/FFMPEGReader.h + plugins/ffmpeg/FFMPEGWriter.h + ) + + if(NOT PLUGIN_FFMPEG) + list(APPEND INCLUDE ${FFMPEG_INCLUDE_DIRS}) + list(APPEND LIBRARIES ${FFMPEG_LIBRARIES}) + list(APPEND SRC ${FFMPEG_SRC}) + list(APPEND HDR ${FFMPEG_HDR}) + list(APPEND STATIC_PLUGINS FFMPEG) + endif() + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB FFMPEG_DLLS ${LIBRARY_PATH}/ffmpeg/bin/*.dll) + list(APPEND DLLS ${FFMPEG_DLLS}) + endif() + else() + set(WITH_FFMPEG FALSE CACHE BOOL "Build With FFMPEG" FORCE) + message(WARNING "FFMPEG not found, plugin will not be built.") + endif() endif() # FFTW if(WITH_FFTW) - if(AUDASPACE_STANDALONE) - find_package(FFTW ${PACKAGE_OPTION}) - endif() - - if(FFTW_FOUND) - set(FFTW_SRC - src/fx/BinauralSound.cpp - src/fx/BinauralReader.cpp - src/fx/Convolver.cpp - src/fx/ConvolverReader.cpp - src/fx/ConvolverSound.cpp - src/fx/FFTConvolver.cpp - src/fx/HRTF.cpp - src/fx/ImpulseResponse.cpp - src/util/FFTPlan.cpp - ) - set(FFTW_HDR - include/fx/BinauralSound.h - include/fx/BinauralReader.h - include/fx/Convolver.h - include/fx/ConvolverReader.h - include/fx/ConvolverSound.h - include/fx/FFTConvolver.h - include/fx/HRTF.h - include/fx/HRTFLoader.h - include/fx/ImpulseResponse.h - include/util/FFTPlan.h - ) - - add_definitions(-DWITH_CONVOLUTION) - - list(APPEND INCLUDE ${FFTW_INCLUDE_DIR}) - list(APPEND LIBRARIES ${FFTW_LIBRARY}) - - list(APPEND SRC ${FFTW_SRC}) - list(APPEND HDR ${FFTW_HDR}) - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB FFTW_DLLS ${LIBRARY_PATH}/fftw/bin/*.dll) - list(APPEND DLLS ${FFTW_DLLS}) - endif() - else() - set(WITH_FFTW FALSE CACHE BOOL "Build With FFTW" FORCE) - message(WARNING "FFTW not found, convolution functionality will not be built.") - endif() + if(AUDASPACE_STANDALONE) + find_package(FFTW ${PACKAGE_OPTION}) + endif() + + if(FFTW_FOUND) + set(FFTW_SRC + src/fx/BinauralSound.cpp + src/fx/BinauralReader.cpp + src/fx/Convolver.cpp + src/fx/ConvolverReader.cpp + src/fx/ConvolverSound.cpp + src/fx/FFTConvolver.cpp + src/fx/HRTF.cpp + src/fx/ImpulseResponse.cpp + src/util/FFTPlan.cpp + ) + set(FFTW_HDR + include/fx/BinauralSound.h + include/fx/BinauralReader.h + include/fx/Convolver.h + include/fx/ConvolverReader.h + include/fx/ConvolverSound.h + include/fx/FFTConvolver.h + include/fx/HRTF.h + include/fx/HRTFLoader.h + include/fx/ImpulseResponse.h + include/util/FFTPlan.h + ) + + add_definitions(-DWITH_CONVOLUTION) + + list(APPEND INCLUDE ${FFTW_INCLUDE_DIR}) + list(APPEND LIBRARIES ${FFTW_LIBRARY}) + + list(APPEND SRC ${FFTW_SRC}) + list(APPEND HDR ${FFTW_HDR}) + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB FFTW_DLLS ${LIBRARY_PATH}/fftw/bin/*.dll) + list(APPEND DLLS ${FFTW_DLLS}) + endif() + else() + set(WITH_FFTW FALSE CACHE BOOL "Build With FFTW" FORCE) + message(WARNING "FFTW not found, convolution functionality will not be built.") + endif() endif() # JACK if(WITH_JACK) - if(AUDASPACE_STANDALONE) - find_package(Jack ${PACKAGE_OPTION}) - endif() - - if(JACK_FOUND) - set(JACK_SRC - plugins/jack/JackDevice.cpp - plugins/jack/JackSynchronizer.cpp - plugins/jack/JackLibrary.cpp - ) - set(JACK_HDR - plugins/jack/JackDevice.h - plugins/jack/JackSynchronizer.h - plugins/jack/JackLibrary.h - plugins/jack/JackSymbols.h - ) - - if(DYNLOAD_JACK) - add_definitions(-DDYNLOAD_JACK) - endif() - - if(NOT PLUGIN_JACK) - list(APPEND INCLUDE ${JACK_INCLUDE_DIRS}) - if(NOT DYNLOAD_JACK) - list(APPEND LIBRARIES ${JACK_LIBRARIES}) - endif() - list(APPEND SRC ${JACK_SRC}) - list(APPEND HDR ${JACK_HDR}) - list(APPEND STATIC_PLUGINS JackDevice) - endif() - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB JACK_DLLS ${LIBRARY_PATH}/jack/bin/*.dll) - list(APPEND DLLS ${JACK_DLLS}) - endif() - else() - set(WITH_JACK FALSE CACHE BOOL "Build With JACK" FORCE) - message(WARNING "JACK not found, plugin will not be built.") - endif() + if(AUDASPACE_STANDALONE) + find_package(Jack ${PACKAGE_OPTION}) + endif() + + if(JACK_FOUND) + set(JACK_SRC + plugins/jack/JackDevice.cpp + plugins/jack/JackSynchronizer.cpp + plugins/jack/JackLibrary.cpp + ) + set(JACK_HDR + plugins/jack/JackDevice.h + plugins/jack/JackSynchronizer.h + plugins/jack/JackLibrary.h + plugins/jack/JackSymbols.h + ) + + if(DYNLOAD_JACK) + add_definitions(-DDYNLOAD_JACK) + endif() + + if(NOT PLUGIN_JACK) + list(APPEND INCLUDE ${JACK_INCLUDE_DIRS}) + if(NOT DYNLOAD_JACK) + list(APPEND LIBRARIES ${JACK_LIBRARIES}) + endif() + list(APPEND SRC ${JACK_SRC}) + list(APPEND HDR ${JACK_HDR}) + list(APPEND STATIC_PLUGINS JackDevice) + endif() + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB JACK_DLLS ${LIBRARY_PATH}/jack/bin/*.dll) + list(APPEND DLLS ${JACK_DLLS}) + endif() + else() + set(WITH_JACK FALSE CACHE BOOL "Build With JACK" FORCE) + message(WARNING "JACK not found, plugin will not be built.") + endif() endif() # LibSndFile if(WITH_LIBSNDFILE) - if(AUDASPACE_STANDALONE) - find_package(LibSndFile ${PACKAGE_OPTION}) - endif() - - if(LIBSNDFILE_FOUND) - set(LIBSNDFILE_SRC - plugins/libsndfile/SndFile.cpp - plugins/libsndfile/SndFileReader.cpp - plugins/libsndfile/SndFileWriter.cpp - ) - set(LIBSNDFILE_HDR - plugins/libsndfile/SndFile.h - plugins/libsndfile/SndFileReader.h - plugins/libsndfile/SndFileWriter.h - ) - - if(NOT PLUGIN_LIBSNDFILE) - list(APPEND INCLUDE ${LIBSNDFILE_INCLUDE_DIRS}) - list(APPEND LIBRARIES ${LIBSNDFILE_LIBRARIES}) - list(APPEND SRC ${LIBSNDFILE_SRC}) - list(APPEND HDR ${LIBSNDFILE_HDR}) - list(APPEND STATIC_PLUGINS SndFile) - endif() - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB LIBSNDFILE_DLLS ${LIBRARY_PATH}/libsndfile/bin/*.dll) - list(APPEND DLLS ${LIBSNDFILE_DLLS}) - endif() - else() - set(WITH_LIBSNDFILE FALSE CACHE BOOL "Build With LibSndFile" FORCE) - message(WARNING "LibSndFile not found, plugin will not be built.") - endif() + if(AUDASPACE_STANDALONE) + find_package(LibSndFile ${PACKAGE_OPTION}) + endif() + + if(LIBSNDFILE_FOUND) + set(LIBSNDFILE_SRC + plugins/libsndfile/SndFile.cpp + plugins/libsndfile/SndFileReader.cpp + plugins/libsndfile/SndFileWriter.cpp + ) + set(LIBSNDFILE_HDR + plugins/libsndfile/SndFile.h + plugins/libsndfile/SndFileReader.h + plugins/libsndfile/SndFileWriter.h + ) + + if(NOT PLUGIN_LIBSNDFILE) + list(APPEND INCLUDE ${LIBSNDFILE_INCLUDE_DIRS}) + list(APPEND LIBRARIES ${LIBSNDFILE_LIBRARIES}) + list(APPEND SRC ${LIBSNDFILE_SRC}) + list(APPEND HDR ${LIBSNDFILE_HDR}) + list(APPEND STATIC_PLUGINS SndFile) + endif() + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB LIBSNDFILE_DLLS ${LIBRARY_PATH}/libsndfile/bin/*.dll) + list(APPEND DLLS ${LIBSNDFILE_DLLS}) + endif() + else() + set(WITH_LIBSNDFILE FALSE CACHE BOOL "Build With LibSndFile" FORCE) + message(WARNING "LibSndFile not found, plugin will not be built.") + endif() endif() # OpenAL if(WITH_OPENAL) - if(AUDASPACE_STANDALONE) - find_package(OpenAL ${PACKAGE_OPTION}) - endif() - - if(OPENAL_FOUND) - set(OPENAL_SRC - plugins/openal/OpenALDevice.cpp - plugins/openal/OpenALReader.cpp - ) - set(OPENAL_HDR - plugins/openal/OpenALDevice.h - plugins/openal/OpenALReader.h - ) - - if(NOT PLUGIN_OPENAL) - list(APPEND INCLUDE ${OPENAL_INCLUDE_DIR}) - list(APPEND LIBRARIES ${OPENAL_LIBRARY}) - list(APPEND SRC ${OPENAL_SRC}) - list(APPEND HDR ${OPENAL_HDR}) - list(APPEND STATIC_PLUGINS OpenALDevice) - endif() - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB OPENAL_DLLS ${LIBRARY_PATH}/OpenAL/bin/*.dll) - list(APPEND DLLS ${OPENAL_DLLS}) - endif() - else() - set(WITH_OPENAL FALSE CACHE BOOL "Build With OpenAL" FORCE) - message(WARNING "OpenAL not found, plugin will not be built.") - endif() + if(AUDASPACE_STANDALONE) + find_package(OpenAL ${PACKAGE_OPTION}) + endif() + + if(OPENAL_FOUND) + set(OPENAL_SRC + plugins/openal/OpenALDevice.cpp + plugins/openal/OpenALReader.cpp + ) + set(OPENAL_HDR + plugins/openal/OpenALDevice.h + plugins/openal/OpenALReader.h + ) + + if(NOT PLUGIN_OPENAL) + list(APPEND INCLUDE ${OPENAL_INCLUDE_DIR}) + list(APPEND LIBRARIES ${OPENAL_LIBRARY}) + list(APPEND SRC ${OPENAL_SRC}) + list(APPEND HDR ${OPENAL_HDR}) + list(APPEND STATIC_PLUGINS OpenALDevice) + endif() + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB OPENAL_DLLS ${LIBRARY_PATH}/OpenAL/bin/*.dll) + list(APPEND DLLS ${OPENAL_DLLS}) + endif() + else() + set(WITH_OPENAL FALSE CACHE BOOL "Build With OpenAL" FORCE) + message(WARNING "OpenAL not found, plugin will not be built.") + endif() endif() # Python if(WITH_PYTHON) - if(AUDASPACE_STANDALONE) - find_package(PythonLibs 3.2 ${PACKAGE_OPTION}) - find_package(NumPy ${PACKAGE_OPTION}) - endif() + if(AUDASPACE_STANDALONE) + find_package(PythonLibs 3.2 ${PACKAGE_OPTION}) + find_package(NumPy ${PACKAGE_OPTION}) + endif() - if(PYTHONLIBS_FOUND AND NUMPY_FOUND) - list(APPEND INCLUDE ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS}) + if(PYTHONLIBS_FOUND AND NUMPY_FOUND) + list(APPEND INCLUDE ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS}) - if(WITH_PYTHON_MODULE) - find_package(PythonInterp 3.2 ${PACKAGE_OPTION}) + if(WITH_PYTHON_MODULE) + find_package(PythonInterp 3.2 ${PACKAGE_OPTION}) - if(NOT PYTHONINTERP_FOUND) - set(WITH_PYTHON_MODULE FALSE) - message(WARNING "Python interpreter not found, module will not be built.") - endif() - endif() + if(NOT PYTHONINTERP_FOUND) + set(WITH_PYTHON_MODULE FALSE) + message(WARNING "Python interpreter not found, module will not be built.") + endif() + endif() - set(AUDASPACE_PY_LIBRARY -laudaspace-py) + set(AUDASPACE_PY_LIBRARY -laudaspace-py) - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB PYTHON_DLLS ${LIBRARY_PATH}/Python/bin/*.dll) - list(APPEND DLLS ${PYTHON_DLLS}) - endif() - else() - set(WITH_PYTHON FALSE CACHE BOOL "Build With Python Library" FORCE) - message(WARNING "Python libraries not found, language binding will not be built.") - endif() + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB PYTHON_DLLS ${LIBRARY_PATH}/Python/bin/*.dll) + list(APPEND DLLS ${PYTHON_DLLS}) + endif() + else() + set(WITH_PYTHON FALSE CACHE BOOL "Build With Python Library" FORCE) + message(WARNING "Python libraries not found, language binding will not be built.") + endif() endif() # SDL if(WITH_SDL) - if(AUDASPACE_STANDALONE) - if(USE_SDL2) - find_package(SDL2) - if(SDL2_FOUND) - set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIR}) - set(SDL_LIBRARY ${SDL2_LIBRARY}) - set(SDL_FOUND TRUE) - else() - find_package(SDL ${PACKAGE_OPTION}) - endif() - else() - find_package(SDL ${PACKAGE_OPTION}) - endif() - endif() - - if(SDL_FOUND) - set(SDL_SRC - plugins/sdl/SDLDevice.cpp - ) - set(SDL_HDR - plugins/sdl/SDLDevice.h - ) - - if(NOT PLUGIN_SDL) - list(APPEND INCLUDE ${SDL_INCLUDE_DIR}) - list(APPEND LIBRARIES ${SDL_LIBRARY}) - list(APPEND SRC ${SDL_SRC}) - list(APPEND HDR ${SDL_HDR}) - list(APPEND STATIC_PLUGINS SDLDevice) - endif() - - if(WIN32 AND AUDASPACE_STANDALONE) - file(GLOB SDL_DLLS ${LIBRARY_PATH}/sdl/bin/*.dll) - list(APPEND DLLS ${SDL_DLLS}) - endif() - else() - set(WITH_SDL FALSE CACHE BOOL "Build With SDL" FORCE) - message(WARNING "SDL not found, plugin will not be built.") - endif() + if(AUDASPACE_STANDALONE) + if(USE_SDL2) + find_package(SDL2) + if(SDL2_FOUND) + set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIR}) + set(SDL_LIBRARY ${SDL2_LIBRARY}) + set(SDL_FOUND TRUE) + else() + find_package(SDL ${PACKAGE_OPTION}) + endif() + else() + find_package(SDL ${PACKAGE_OPTION}) + endif() + endif() + + if(SDL_FOUND) + set(SDL_SRC + plugins/sdl/SDLDevice.cpp + ) + set(SDL_HDR + plugins/sdl/SDLDevice.h + ) + + if(NOT PLUGIN_SDL) + list(APPEND INCLUDE ${SDL_INCLUDE_DIR}) + list(APPEND LIBRARIES ${SDL_LIBRARY}) + list(APPEND SRC ${SDL_SRC}) + list(APPEND HDR ${SDL_HDR}) + list(APPEND STATIC_PLUGINS SDLDevice) + endif() + + if(WIN32 AND AUDASPACE_STANDALONE) + file(GLOB SDL_DLLS ${LIBRARY_PATH}/sdl/bin/*.dll) + list(APPEND DLLS ${SDL_DLLS}) + endif() + else() + set(WITH_SDL FALSE CACHE BOOL "Build With SDL" FORCE) + message(WARNING "SDL not found, plugin will not be built.") + endif() endif() # library configuration if(SHARED_LIBRARY) - set(AUD_LIBRARY_TYPE AUD_SHARED_LIBRARY) - set(LIBRARY_TYPE SHARED) - add_definitions(-DAUD_BUILD_SHARED_LIBRARY) + set(AUD_LIBRARY_TYPE AUD_SHARED_LIBRARY) + set(LIBRARY_TYPE SHARED) + add_definitions(-DAUD_BUILD_SHARED_LIBRARY) else() - set(AUD_LIBRARY_TYPE AUD_STATIC_LIBRARY) - set(LIBRARY_TYPE STATIC) + set(AUD_LIBRARY_TYPE AUD_STATIC_LIBRARY) + set(LIBRARY_TYPE STATIC) endif() # file configuration @@ -691,28 +691,28 @@ set(STATIC_PLUGIN_CLASSES "") set(STATIC_PLUGIN_REGISTERS "") foreach(PLUGIN ${STATIC_PLUGINS}) - list(APPEND STATIC_PLUGIN_CLASSES "STATIC_PLUGIN_CLASS(" ${PLUGIN} ")\n") - list(APPEND STATIC_PLUGIN_REGISTERS "\tSTATIC_PLUGIN_REGISTER(" ${PLUGIN} ")\n") + list(APPEND STATIC_PLUGIN_CLASSES "STATIC_PLUGIN_CLASS(" ${PLUGIN} ")\n") + list(APPEND STATIC_PLUGIN_REGISTERS "\tSTATIC_PLUGIN_REGISTER(" ${PLUGIN} ")\n") endforeach() string(CONCAT STATIC_PLUGIN_CLASSES ${STATIC_PLUGIN_CLASSES}) string(CONCAT STATIC_PLUGIN_REGISTERS ${STATIC_PLUGIN_REGISTERS}) if(WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/PluginManagerWindows.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/PluginManager.cpp ESCAPE_QUOTES @ONLY) - if(WITH_FFTW) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/fx/HRTFLoaderWindows.cpp ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp COPYONLY) - endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/PluginManagerWindows.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/PluginManager.cpp ESCAPE_QUOTES @ONLY) + if(WITH_FFTW) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/fx/HRTFLoaderWindows.cpp ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp COPYONLY) + endif() else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/PluginManagerUnix.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/PluginManager.cpp ESCAPE_QUOTES @ONLY) - if(WITH_FFTW) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/fx/HRTFLoaderUnix.cpp ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp COPYONLY) - endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin/PluginManagerUnix.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/PluginManager.cpp ESCAPE_QUOTES @ONLY) + if(WITH_FFTW) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/fx/HRTFLoaderUnix.cpp ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp COPYONLY) + endif() endif() list(APPEND SRC ${CMAKE_CURRENT_BINARY_DIR}/PluginManager.cpp) if(WITH_FFTW) - list(APPEND SRC ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp) + list(APPEND SRC ${CMAKE_CURRENT_BINARY_DIR}/HRTFLoader.cpp) endif() # directories @@ -723,9 +723,9 @@ link_directories() # install configuration if(WIN32) - set(BIN_DESTINATION ".") + set(BIN_DESTINATION ".") else() - set(BIN_DESTINATION "bin") + set(BIN_DESTINATION "bin") endif() set(LIB_DESTINATION "lib${LIB_SUFFIX}") @@ -737,254 +737,254 @@ target_link_libraries(audaspace ${LIBRARIES}) set_target_properties(audaspace PROPERTIES SOVERSION ${AUDASPACE_VERSION}) if(AUDASPACE_STANDALONE) - install(TARGETS audaspace - RUNTIME DESTINATION ${BIN_DESTINATION} - LIBRARY DESTINATION ${LIB_DESTINATION} - ARCHIVE DESTINATION ${LIB_DESTINATION} - ) + install(TARGETS audaspace + RUNTIME DESTINATION ${BIN_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + ARCHIVE DESTINATION ${LIB_DESTINATION} + ) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/audaspace) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Audaspace.h DESTINATION include/audaspace) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/audaspace) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Audaspace.h DESTINATION include/audaspace) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packages/pkgconfig/audaspace.pc.in ${CMAKE_CURRENT_BINARY_DIR}/audaspace.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packages/pkgconfig/audaspace.pc.in ${CMAKE_CURRENT_BINARY_DIR}/audaspace.pc @ONLY) - if(NOT WIN32 AND NOT APPLE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audaspace.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") - endif() + if(NOT WIN32 AND NOT APPLE) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audaspace.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") + endif() endif() # plugins if(WITH_FFMPEG AND PLUGIN_FFMPEG) - add_definitions(-DFFMPEG_PLUGIN) - include_directories(${INCLUDE} ${FFMPEG_INCLUDE_DIRS}) - add_library(audffmpeg SHARED ${FFMPEG_SRC} ${FFMPEG_HDR} ${HDR}) - target_link_libraries(audffmpeg audaspace ${FFMPEG_LIBRARIES}) - set_target_properties(audffmpeg PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - install(TARGETS audffmpeg DESTINATION ${DEFAULT_PLUGIN_PATH}) + add_definitions(-DFFMPEG_PLUGIN) + include_directories(${INCLUDE} ${FFMPEG_INCLUDE_DIRS}) + add_library(audffmpeg SHARED ${FFMPEG_SRC} ${FFMPEG_HDR} ${HDR}) + target_link_libraries(audffmpeg audaspace ${FFMPEG_LIBRARIES}) + set_target_properties(audffmpeg PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + install(TARGETS audffmpeg DESTINATION ${DEFAULT_PLUGIN_PATH}) endif() if(WITH_JACK AND PLUGIN_JACK) - add_definitions(-DJACK_PLUGIN) - include_directories(${INCLUDE} ${JACK_INCLUDE_DIRS}) - add_library(audjack SHARED ${JACK_SRC} ${JACK_HDR} ${HDR}) - if(DYNLOAD_JACK) - target_link_libraries(audjack audaspace) - else() - target_link_libraries(audjack audaspace ${JACK_LIBRARIES}) - endif() - set_target_properties(audjack PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - install(TARGETS audjack DESTINATION ${DEFAULT_PLUGIN_PATH}) + add_definitions(-DJACK_PLUGIN) + include_directories(${INCLUDE} ${JACK_INCLUDE_DIRS}) + add_library(audjack SHARED ${JACK_SRC} ${JACK_HDR} ${HDR}) + if(DYNLOAD_JACK) + target_link_libraries(audjack audaspace) + else() + target_link_libraries(audjack audaspace ${JACK_LIBRARIES}) + endif() + set_target_properties(audjack PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + install(TARGETS audjack DESTINATION ${DEFAULT_PLUGIN_PATH}) endif() if(WITH_LIBSNDFILE AND PLUGIN_LIBSNDFILE) - add_definitions(-DLIBSNDFILE_PLUGIN) - include_directories(${INCLUDE} ${LIBSNDFILE_INCLUDE_DIRS}) - add_library(audlibsndfile SHARED ${LIBSNDFILE_SRC} ${LIBSNDFILE_HDR} ${HDR}) - set_target_properties(audlibsndfile PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - target_link_libraries(audlibsndfile audaspace ${LIBSNDFILE_LIBRARIES}) - install(TARGETS audlibsndfile DESTINATION ${DEFAULT_PLUGIN_PATH}) + add_definitions(-DLIBSNDFILE_PLUGIN) + include_directories(${INCLUDE} ${LIBSNDFILE_INCLUDE_DIRS}) + add_library(audlibsndfile SHARED ${LIBSNDFILE_SRC} ${LIBSNDFILE_HDR} ${HDR}) + set_target_properties(audlibsndfile PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + target_link_libraries(audlibsndfile audaspace ${LIBSNDFILE_LIBRARIES}) + install(TARGETS audlibsndfile DESTINATION ${DEFAULT_PLUGIN_PATH}) endif() if(WITH_OPENAL AND PLUGIN_OPENAL) - add_definitions(-DOPENAL_PLUGIN) - include_directories(${INCLUDE} ${OPENAL_INCLUDE_DIR}) - add_library(audopenal SHARED ${OPENAL_SRC} ${OPENAL_HDR} ${HDR}) - set_target_properties(audopenal PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - target_link_libraries(audopenal audaspace ${OPENAL_LIBRARY}) - install(TARGETS audopenal DESTINATION ${DEFAULT_PLUGIN_PATH}) + add_definitions(-DOPENAL_PLUGIN) + include_directories(${INCLUDE} ${OPENAL_INCLUDE_DIR}) + add_library(audopenal SHARED ${OPENAL_SRC} ${OPENAL_HDR} ${HDR}) + set_target_properties(audopenal PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + target_link_libraries(audopenal audaspace ${OPENAL_LIBRARY}) + install(TARGETS audopenal DESTINATION ${DEFAULT_PLUGIN_PATH}) endif() if(WITH_SDL AND PLUGIN_SDL) - add_definitions(-DSDL_PLUGIN) - include_directories(${INCLUDE} ${SDL_INCLUDE_DIR}) - add_library(audsdl SHARED ${SDL_SRC} ${SDL_HDR} ${HDR}) - set_target_properties(audsdl PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - target_link_libraries(audsdl audaspace ${SDL_LIBRARY}) - install(TARGETS audsdl DESTINATION ${DEFAULT_PLUGIN_PATH}) + add_definitions(-DSDL_PLUGIN) + include_directories(${INCLUDE} ${SDL_INCLUDE_DIR}) + add_library(audsdl SHARED ${SDL_SRC} ${SDL_HDR} ${HDR}) + set_target_properties(audsdl PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + target_link_libraries(audsdl audaspace ${SDL_LIBRARY}) + install(TARGETS audsdl DESTINATION ${DEFAULT_PLUGIN_PATH}) endif() # dlls if(WIN32) - if(DLLS) - install(FILES ${DLLS} DESTINATION ${BIN_DESTINATION}) - endif() + if(DLLS) + install(FILES ${DLLS} DESTINATION ${BIN_DESTINATION}) + endif() endif() # demos if(BUILD_DEMOS) - include_directories(${INCLUDE}) + include_directories(${INCLUDE}) - set(DEMOS audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager) + set(DEMOS audaplay audaconvert audaremap signalgen randsounds dynamicmusic playbackmanager) - add_executable(audaplay demos/audaplay.cpp) - target_link_libraries(audaplay audaspace) + add_executable(audaplay demos/audaplay.cpp) + target_link_libraries(audaplay audaspace) - add_executable(audaconvert demos/audaconvert.cpp) - target_link_libraries(audaconvert audaspace) + add_executable(audaconvert demos/audaconvert.cpp) + target_link_libraries(audaconvert audaspace) - add_executable(audaremap demos/audaremap.cpp) - target_link_libraries(audaremap audaspace) + add_executable(audaremap demos/audaremap.cpp) + target_link_libraries(audaremap audaspace) - add_executable(signalgen demos/signalgen.cpp) - target_link_libraries(signalgen audaspace) + add_executable(signalgen demos/signalgen.cpp) + target_link_libraries(signalgen audaspace) - add_executable(randsounds demos/randsounds.cpp) - target_link_libraries(randsounds audaspace) + add_executable(randsounds demos/randsounds.cpp) + target_link_libraries(randsounds audaspace) - add_executable(dynamicmusic demos/dynamicmusic.cpp) - target_link_libraries(dynamicmusic audaspace) + add_executable(dynamicmusic demos/dynamicmusic.cpp) + target_link_libraries(dynamicmusic audaspace) - add_executable(playbackmanager demos/playbackmanager.cpp) - target_link_libraries(playbackmanager audaspace) + add_executable(playbackmanager demos/playbackmanager.cpp) + target_link_libraries(playbackmanager audaspace) - if(WITH_FFTW) - list(APPEND DEMOS convolution binaural) + if(WITH_FFTW) + list(APPEND DEMOS convolution binaural) - add_executable(convolution demos/convolution.cpp) - target_link_libraries(convolution audaspace) + add_executable(convolution demos/convolution.cpp) + target_link_libraries(convolution audaspace) - add_executable(binaural demos/binaural.cpp) - target_link_libraries(binaural audaspace) - endif() + add_executable(binaural demos/binaural.cpp) + target_link_libraries(binaural audaspace) + endif() - if(WITH_OPENAL) - list(APPEND DEMOS openaldevices) + if(WITH_OPENAL) + list(APPEND DEMOS openaldevices) - add_executable(openaldevices demos/openaldevices.cpp) - if(PLUGIN_OPENAL) - target_link_libraries(openaldevices audaspace audopenal) - else() - target_link_libraries(openaldevices audaspace) - endif() - endif() + add_executable(openaldevices demos/openaldevices.cpp) + if(PLUGIN_OPENAL) + target_link_libraries(openaldevices audaspace audopenal) + else() + target_link_libraries(openaldevices audaspace) + endif() + endif() - install(TARGETS ${DEMOS} - RUNTIME DESTINATION ${BIN_DESTINATION} - LIBRARY DESTINATION ${LIB_DESTINATION} - ARCHIVE DESTINATION ${LIB_DESTINATION} - ) + install(TARGETS ${DEMOS} + RUNTIME DESTINATION ${BIN_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + ARCHIVE DESTINATION ${LIB_DESTINATION} + ) endif() # bindings if(WITH_C) - if(SEPARATE_C) - add_library(audaspace-c ${LIBRARY_TYPE} ${C_SRC} ${C_HDR}) - target_link_libraries(audaspace-c audaspace) - set_target_properties(audaspace-c PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - install(TARGETS audaspace-c - RUNTIME DESTINATION ${BIN_DESTINATION} - LIBRARY DESTINATION ${LIB_DESTINATION} - ARCHIVE DESTINATION ${LIB_DESTINATION} - ) - endif() - - if(AUDASPACE_STANDALONE) - install(FILES ${C_HDR} DESTINATION include/audaspace) - endif() + if(SEPARATE_C) + add_library(audaspace-c ${LIBRARY_TYPE} ${C_SRC} ${C_HDR}) + target_link_libraries(audaspace-c audaspace) + set_target_properties(audaspace-c PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + install(TARGETS audaspace-c + RUNTIME DESTINATION ${BIN_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + ARCHIVE DESTINATION ${LIB_DESTINATION} + ) + endif() + + if(AUDASPACE_STANDALONE) + install(FILES ${C_HDR} DESTINATION include/audaspace) + endif() endif() if(WITH_PYTHON) - set(PYTHON_SRC - bindings/python/PyAPI.cpp - bindings/python/PyDevice.cpp - bindings/python/PyDynamicMusic.cpp - bindings/python/PyHandle.cpp - bindings/python/PyPlaybackManager.cpp - bindings/python/PySequence.cpp - bindings/python/PySequenceEntry.cpp - bindings/python/PySound.cpp - bindings/python/PySource.cpp - bindings/python/PyThreadPool.cpp - ) - set(PYTHON_HDR - bindings/python/PyAPI.h - bindings/python/PyDevice.h - bindings/python/PyDynamicMusic.h - bindings/python/PyHandle.h - bindings/python/PyPlaybackManager.h - bindings/python/PySequence.h - bindings/python/PySequenceEntry.h - bindings/python/PySound.h - bindings/python/PySource.h - bindings/python/PyThreadPool.h - ) - - if(WITH_FFTW) - list(APPEND PYTHON_SRC - bindings/python/PyHRTF.cpp - bindings/python/PyImpulseResponse.cpp - ) - list(APPEND PYTHON_HDR - bindings/python/PyHRTF.h - bindings/python/PyImpulseResponse.h - ) - endif() - - add_library(audaspace-py ${LIBRARY_TYPE} ${PYTHON_SRC} ${PYTHON_HDR}) - target_link_libraries(audaspace-py audaspace ${PYTHON_LIBRARIES}) - set_target_properties(audaspace-py PROPERTIES SOVERSION ${AUDASPACE_VERSION}) - - if(AUDASPACE_STANDALONE) - install(TARGETS audaspace-py - RUNTIME DESTINATION ${BIN_DESTINATION} - LIBRARY DESTINATION ${LIB_DESTINATION} - ARCHIVE DESTINATION ${LIB_DESTINATION} - ) - - install(FILES ${PYTHON_HDR} DESTINATION include/audaspace/python) - endif() - - if(WITH_PYTHON_MODULE) - set(PYTHON_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python) - configure_file(${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py ESCAPE_QUOTES @ONLY) - - if(APPLE) - add_custom_command(OUTPUT build COMMAND MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) - elseif(WIN32) - set(ENV{VS100COMNTOOLS} $ENV{VS120COMNTOOLS}) - add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) - else() - add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) - endif() - add_custom_target(pythonmodule ALL DEPENDS build SOURCES ${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${PYTHON_SRC} ${PYTHON_HDR}) - add_dependencies(pythonmodule audaspace) - - install(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=\$ENV{DESTDIR} --prefix=${CMAKE_INSTALL_PREFIX})") - endif() + set(PYTHON_SRC + bindings/python/PyAPI.cpp + bindings/python/PyDevice.cpp + bindings/python/PyDynamicMusic.cpp + bindings/python/PyHandle.cpp + bindings/python/PyPlaybackManager.cpp + bindings/python/PySequence.cpp + bindings/python/PySequenceEntry.cpp + bindings/python/PySound.cpp + bindings/python/PySource.cpp + bindings/python/PyThreadPool.cpp + ) + set(PYTHON_HDR + bindings/python/PyAPI.h + bindings/python/PyDevice.h + bindings/python/PyDynamicMusic.h + bindings/python/PyHandle.h + bindings/python/PyPlaybackManager.h + bindings/python/PySequence.h + bindings/python/PySequenceEntry.h + bindings/python/PySound.h + bindings/python/PySource.h + bindings/python/PyThreadPool.h + ) + + if(WITH_FFTW) + list(APPEND PYTHON_SRC + bindings/python/PyHRTF.cpp + bindings/python/PyImpulseResponse.cpp + ) + list(APPEND PYTHON_HDR + bindings/python/PyHRTF.h + bindings/python/PyImpulseResponse.h + ) + endif() + + add_library(audaspace-py ${LIBRARY_TYPE} ${PYTHON_SRC} ${PYTHON_HDR}) + target_link_libraries(audaspace-py audaspace ${PYTHON_LIBRARIES}) + set_target_properties(audaspace-py PROPERTIES SOVERSION ${AUDASPACE_VERSION}) + + if(AUDASPACE_STANDALONE) + install(TARGETS audaspace-py + RUNTIME DESTINATION ${BIN_DESTINATION} + LIBRARY DESTINATION ${LIB_DESTINATION} + ARCHIVE DESTINATION ${LIB_DESTINATION} + ) + + install(FILES ${PYTHON_HDR} DESTINATION include/audaspace/python) + endif() + + if(WITH_PYTHON_MODULE) + set(PYTHON_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python) + configure_file(${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py ESCAPE_QUOTES @ONLY) + + if(APPLE) + add_custom_command(OUTPUT build COMMAND MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) + elseif(WIN32) + set(ENV{VS100COMNTOOLS} $ENV{VS120COMNTOOLS}) + add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) + else() + add_custom_command(OUTPUT build COMMAND ${PYTHON_EXECUTABLE} setup.py build DEPENDS ${PYTHON_SRC} ${PYTHON_HDR}) + endif() + add_custom_target(pythonmodule ALL DEPENDS build SOURCES ${PYTHON_SOURCE_DIRECTORY}/setup.py.in ${PYTHON_SRC} ${PYTHON_HDR}) + add_dependencies(pythonmodule audaspace) + + install(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} setup.py install --root=\$ENV{DESTDIR} --prefix=${CMAKE_INSTALL_PREFIX})") + endif() endif() # docs if(WITH_DOCS) - find_package(Doxygen ${PACKAGE_OPTION}) + find_package(Doxygen ${PACKAGE_OPTION}) - if(DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) + if(DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) - add_custom_target(audaspace_doc ALL ${DOXYGEN_EXECUTABLE} Doxyfile COMMENT "Building C++ HTML documentation with Doxygen.") - else() - set(WITH_DOCS FALSE CACHE BOOL "Build C++ HTML Documentation with Doxygen" FORCE) - message(WARNING "Doxygen (and/or dot) not found, documentation will not be built.") - endif() + add_custom_target(audaspace_doc ALL ${DOXYGEN_EXECUTABLE} Doxyfile COMMENT "Building C++ HTML documentation with Doxygen.") + else() + set(WITH_DOCS FALSE CACHE BOOL "Build C++ HTML Documentation with Doxygen" FORCE) + message(WARNING "Doxygen (and/or dot) not found, documentation will not be built.") + endif() endif() if(WITH_BINDING_DOCS) - find_package(Sphinx ${PACKAGE_OPTION}) + find_package(Sphinx ${PACKAGE_OPTION}) - if(SPHINX_FOUND) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/doc/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py @ONLY) + if(SPHINX_FOUND) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/doc/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py @ONLY) - add_custom_target(bindings_doc ALL COMMAND ${PYTHON_EXECUTABLE} setup.py --build-docs ${SPHINX_EXECUTABLE} -q -b html -c "${CMAKE_CURRENT_BINARY_DIR}" -d "${CMAKE_CURRENT_BINARY_DIR}/_doctrees" "${CMAKE_CURRENT_SOURCE_DIR}/bindings/doc" "${CMAKE_CURRENT_BINARY_DIR}/doc/bindings" DEPENDS pythonmodule COMMENT "Building C/Python HTML documentation with Sphinx.") - else() - set(WITH_BINDING_DOCS FALSE CACHE BOOL "Build C/Python HTML Documentation with Sphinx" FORCE) - message(WARNING "Sphinx not found, binding documentation will not be built.") - endif() + add_custom_target(bindings_doc ALL COMMAND ${PYTHON_EXECUTABLE} setup.py --build-docs ${SPHINX_EXECUTABLE} -q -b html -c "${CMAKE_CURRENT_BINARY_DIR}" -d "${CMAKE_CURRENT_BINARY_DIR}/_doctrees" "${CMAKE_CURRENT_SOURCE_DIR}/bindings/doc" "${CMAKE_CURRENT_BINARY_DIR}/doc/bindings" DEPENDS pythonmodule COMMENT "Building C/Python HTML documentation with Sphinx.") + else() + set(WITH_BINDING_DOCS FALSE CACHE BOOL "Build C/Python HTML Documentation with Sphinx" FORCE) + message(WARNING "Sphinx not found, binding documentation will not be built.") + endif() endif() if(WITH_DOCS OR WITH_BINDING_DOCS) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/ DESTINATION ${DOCUMENTATION_INSTALL_PATH}) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/ DESTINATION ${DOCUMENTATION_INSTALL_PATH}) endif() diff --git a/extern/audaspace/blender_config.cmake b/extern/audaspace/blender_config.cmake index 7deb78d27da..0cf4709965f 100644 --- a/extern/audaspace/blender_config.cmake +++ b/extern/audaspace/blender_config.cmake @@ -25,7 +25,7 @@ set(NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_INCLUDE_DIRS}) set(SDL_FOUND ${WITH_SDL}) if(WIN32) - set(DEFAULT_PLUGIN_PATH "plugins" CACHE STRING "Default plugin installation and loading path.") + set(DEFAULT_PLUGIN_PATH "plugins" CACHE STRING "Default plugin installation and loading path.") endif() mark_as_advanced(BUILD_DEMOS SHARED_LIBRARY WITH_C WITH_DOCS WITH_FFMPEG WITH_FFTW WITH_LIBSNDFILE SEPARATE_C PLUGIN_FFMPEG PLUGIN_JACK PLUGIN_LIBSNDFILE PLUGIN_OPENAL PLUGIN_SDL WITH_PYTHON_MODULE DYNLOAD_JACK WITH_BINDING_DOCS DEFAULT_PLUGIN_PATH) diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt index 766939b4228..4dfe960c571 100644 --- a/extern/binreloc/CMakeLists.txt +++ b/extern/binreloc/CMakeLists.txt @@ -19,7 +19,7 @@ # set(INC - include + include ) set(INC_SYS @@ -27,9 +27,9 @@ set(INC_SYS ) set(SRC - binreloc.c + binreloc.c - include/binreloc.h + include/binreloc.h ) set(LIB diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index b9c21bd831f..f1bb6a37cbf 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -19,8 +19,8 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . - src + . + src ) set(INC_SYS @@ -28,391 +28,391 @@ set(INC_SYS ) set(SRC - src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp - src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp - src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp - src/BulletCollision/BroadphaseCollision/btDbvt.cpp - src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp - src/BulletCollision/BroadphaseCollision/btDispatcher.cpp - src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp - src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp - src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp - src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp - src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp - src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp - src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp - src/BulletCollision/CollisionDispatch/btCollisionObject.cpp - src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp - src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp - src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp - src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btGhostObject.cpp - src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp - src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp - src/BulletCollision/CollisionDispatch/btManifoldResult.cpp - src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp - src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp - src/BulletCollision/CollisionDispatch/btUnionFind.cpp - src/BulletCollision/CollisionShapes/btBox2dShape.cpp - src/BulletCollision/CollisionShapes/btBoxShape.cpp - src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp - src/BulletCollision/CollisionShapes/btCapsuleShape.cpp - src/BulletCollision/CollisionShapes/btCollisionShape.cpp - src/BulletCollision/CollisionShapes/btCompoundShape.cpp - src/BulletCollision/CollisionShapes/btConcaveShape.cpp - src/BulletCollision/CollisionShapes/btConeShape.cpp - src/BulletCollision/CollisionShapes/btConvex2dShape.cpp - src/BulletCollision/CollisionShapes/btConvexHullShape.cpp - src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp - src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp - src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp - src/BulletCollision/CollisionShapes/btConvexShape.cpp - src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp - src/BulletCollision/CollisionShapes/btCylinderShape.cpp - src/BulletCollision/CollisionShapes/btEmptyShape.cpp - src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp - src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp - src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp - src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp - src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp - src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp - src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp - src/BulletCollision/CollisionShapes/btShapeHull.cpp - src/BulletCollision/CollisionShapes/btSphereShape.cpp - src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp - src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp - src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp - src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp - src/BulletCollision/CollisionShapes/btTriangleCallback.cpp - src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp - src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp - src/BulletCollision/CollisionShapes/btTriangleMesh.cpp - src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp - src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp - src/BulletCollision/Gimpact/btContactProcessing.cpp - src/BulletCollision/Gimpact/btGImpactBvh.cpp - src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp - src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp - src/BulletCollision/Gimpact/btGImpactShape.cpp - src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp - src/BulletCollision/Gimpact/btTriangleShapeEx.cpp - src/BulletCollision/Gimpact/gim_box_set.cpp - src/BulletCollision/Gimpact/gim_contact.cpp - src/BulletCollision/Gimpact/gim_memory.cpp - src/BulletCollision/Gimpact/gim_tri_collision.cpp - src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp - src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp - src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp - src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp - src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp - src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp - src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp - src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp - src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp - src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp - src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp - src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp + src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp + src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp + src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp + src/BulletCollision/BroadphaseCollision/btDbvt.cpp + src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp + src/BulletCollision/BroadphaseCollision/btDispatcher.cpp + src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp + src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp + src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp + src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp + src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp + src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp + src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp + src/BulletCollision/CollisionDispatch/btCollisionObject.cpp + src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp + src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp + src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp + src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btGhostObject.cpp + src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp + src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp + src/BulletCollision/CollisionDispatch/btManifoldResult.cpp + src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp + src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp + src/BulletCollision/CollisionDispatch/btUnionFind.cpp + src/BulletCollision/CollisionShapes/btBox2dShape.cpp + src/BulletCollision/CollisionShapes/btBoxShape.cpp + src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btCapsuleShape.cpp + src/BulletCollision/CollisionShapes/btCollisionShape.cpp + src/BulletCollision/CollisionShapes/btCompoundShape.cpp + src/BulletCollision/CollisionShapes/btConcaveShape.cpp + src/BulletCollision/CollisionShapes/btConeShape.cpp + src/BulletCollision/CollisionShapes/btConvex2dShape.cpp + src/BulletCollision/CollisionShapes/btConvexHullShape.cpp + src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp + src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp + src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp + src/BulletCollision/CollisionShapes/btConvexShape.cpp + src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btCylinderShape.cpp + src/BulletCollision/CollisionShapes/btEmptyShape.cpp + src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp + src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp + src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp + src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp + src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp + src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btShapeHull.cpp + src/BulletCollision/CollisionShapes/btSphereShape.cpp + src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp + src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp + src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp + src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp + src/BulletCollision/CollisionShapes/btTriangleCallback.cpp + src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp + src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp + src/BulletCollision/CollisionShapes/btTriangleMesh.cpp + src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp + src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp + src/BulletCollision/Gimpact/btContactProcessing.cpp + src/BulletCollision/Gimpact/btGImpactBvh.cpp + src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp + src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp + src/BulletCollision/Gimpact/btGImpactShape.cpp + src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp + src/BulletCollision/Gimpact/btTriangleShapeEx.cpp + src/BulletCollision/Gimpact/gim_box_set.cpp + src/BulletCollision/Gimpact/gim_contact.cpp + src/BulletCollision/Gimpact/gim_memory.cpp + src/BulletCollision/Gimpact/gim_tri_collision.cpp + src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp + src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp + src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp + src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp + src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp + src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp + src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp + src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp + src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp - src/BulletDynamics/Character/btKinematicCharacterController.cpp - src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp - src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp - src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp - src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp - src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp - src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp - src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp - src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp - src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp - src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp - src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp - src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp - src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp - src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp - src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp - src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp - src/BulletDynamics/Dynamics/Bullet-C-API.cpp - src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp - src/BulletDynamics/Dynamics/btRigidBody.cpp - src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp - src/BulletDynamics/Featherstone/btMultiBody.cpp - src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp - src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp - src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp - src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp - src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp - src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp - src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp - src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp - src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp - src/BulletDynamics/Vehicle/btRaycastVehicle.cpp - src/BulletDynamics/Vehicle/btWheelInfo.cpp + src/BulletDynamics/Character/btKinematicCharacterController.cpp + src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp + src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp + src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp + src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp + src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp + src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp + src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp + src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp + src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp + src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp + src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp + src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp + src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp + src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp + src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp + src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp + src/BulletDynamics/Dynamics/Bullet-C-API.cpp + src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp + src/BulletDynamics/Dynamics/btRigidBody.cpp + src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp + src/BulletDynamics/Featherstone/btMultiBody.cpp + src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp + src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp + src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp + src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp + src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp + src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp + src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp + src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp + src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp + src/BulletDynamics/Vehicle/btRaycastVehicle.cpp + src/BulletDynamics/Vehicle/btWheelInfo.cpp - src/BulletSoftBody/btDefaultSoftBodySolver.cpp - src/BulletSoftBody/btSoftBody.cpp - src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp - src/BulletSoftBody/btSoftBodyHelpers.cpp - src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp - src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp - src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp - src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp + src/BulletSoftBody/btDefaultSoftBodySolver.cpp + src/BulletSoftBody/btSoftBody.cpp + src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp + src/BulletSoftBody/btSoftBodyHelpers.cpp + src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp + src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp + src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp + src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp - src/LinearMath/btAlignedAllocator.cpp - src/LinearMath/btConvexHull.cpp - src/LinearMath/btConvexHullComputer.cpp - src/LinearMath/btGeometryUtil.cpp - src/LinearMath/btPolarDecomposition.cpp - src/LinearMath/btQuickprof.cpp - src/LinearMath/btSerializer.cpp - src/LinearMath/btVector3.cpp + src/LinearMath/btAlignedAllocator.cpp + src/LinearMath/btConvexHull.cpp + src/LinearMath/btConvexHullComputer.cpp + src/LinearMath/btGeometryUtil.cpp + src/LinearMath/btPolarDecomposition.cpp + src/LinearMath/btQuickprof.cpp + src/LinearMath/btSerializer.cpp + src/LinearMath/btVector3.cpp - src/BulletCollision/BroadphaseCollision/btAxisSweep3.h - src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h - src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h - src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h - src/BulletCollision/BroadphaseCollision/btDbvt.h - src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h - src/BulletCollision/BroadphaseCollision/btDispatcher.h - src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h - src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h - src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h - src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h - src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h - src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h - src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h - src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h - src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h - src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h - src/BulletCollision/CollisionDispatch/btCollisionObject.h - src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h - src/BulletCollision/CollisionDispatch/btCollisionWorld.h - src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h - src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h - src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h - src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h - src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btGhostObject.h - src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h - src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h - src/BulletCollision/CollisionDispatch/btManifoldResult.h - src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h - src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h - src/BulletCollision/CollisionDispatch/btUnionFind.h - src/BulletCollision/CollisionShapes/btBox2dShape.h - src/BulletCollision/CollisionShapes/btBoxShape.h - src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h - src/BulletCollision/CollisionShapes/btCapsuleShape.h - src/BulletCollision/CollisionShapes/btCollisionMargin.h - src/BulletCollision/CollisionShapes/btCollisionShape.h - src/BulletCollision/CollisionShapes/btCompoundShape.h - src/BulletCollision/CollisionShapes/btConcaveShape.h - src/BulletCollision/CollisionShapes/btConeShape.h - src/BulletCollision/CollisionShapes/btConvex2dShape.h - src/BulletCollision/CollisionShapes/btConvexHullShape.h - src/BulletCollision/CollisionShapes/btConvexInternalShape.h - src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h - src/BulletCollision/CollisionShapes/btConvexPolyhedron.h - src/BulletCollision/CollisionShapes/btConvexShape.h - src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h - src/BulletCollision/CollisionShapes/btCylinderShape.h - src/BulletCollision/CollisionShapes/btEmptyShape.h - src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h - src/BulletCollision/CollisionShapes/btMaterial.h - src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h - src/BulletCollision/CollisionShapes/btMultiSphereShape.h - src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h - src/BulletCollision/CollisionShapes/btOptimizedBvh.h - src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h - src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h - src/BulletCollision/CollisionShapes/btShapeHull.h - src/BulletCollision/CollisionShapes/btSphereShape.h - src/BulletCollision/CollisionShapes/btStaticPlaneShape.h - src/BulletCollision/CollisionShapes/btStridingMeshInterface.h - src/BulletCollision/CollisionShapes/btTetrahedronShape.h - src/BulletCollision/CollisionShapes/btTriangleBuffer.h - src/BulletCollision/CollisionShapes/btTriangleCallback.h - src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h - src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h - src/BulletCollision/CollisionShapes/btTriangleInfoMap.h - src/BulletCollision/CollisionShapes/btTriangleMesh.h - src/BulletCollision/CollisionShapes/btTriangleMeshShape.h - src/BulletCollision/CollisionShapes/btTriangleShape.h - src/BulletCollision/CollisionShapes/btUniformScalingShape.h - src/BulletCollision/Gimpact/btBoxCollision.h - src/BulletCollision/Gimpact/btClipPolygon.h - src/BulletCollision/Gimpact/btCompoundFromGimpact.h - src/BulletCollision/Gimpact/btContactProcessing.h - src/BulletCollision/Gimpact/btGImpactBvh.h - src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h - src/BulletCollision/Gimpact/btGImpactMassUtil.h - src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h - src/BulletCollision/Gimpact/btGImpactShape.h - src/BulletCollision/Gimpact/btGenericPoolAllocator.h - src/BulletCollision/Gimpact/btGeometryOperations.h - src/BulletCollision/Gimpact/btQuantization.h - src/BulletCollision/Gimpact/btTriangleShapeEx.h - src/BulletCollision/Gimpact/gim_array.h - src/BulletCollision/Gimpact/gim_basic_geometry_operations.h - src/BulletCollision/Gimpact/gim_bitset.h - src/BulletCollision/Gimpact/gim_box_collision.h - src/BulletCollision/Gimpact/gim_box_set.h - src/BulletCollision/Gimpact/gim_clip_polygon.h - src/BulletCollision/Gimpact/gim_contact.h - src/BulletCollision/Gimpact/gim_geom_types.h - src/BulletCollision/Gimpact/gim_geometry.h - src/BulletCollision/Gimpact/gim_hash_table.h - src/BulletCollision/Gimpact/gim_linear_math.h - src/BulletCollision/Gimpact/gim_math.h - src/BulletCollision/Gimpact/gim_memory.h - src/BulletCollision/Gimpact/gim_radixsort.h - src/BulletCollision/Gimpact/gim_tri_collision.h - src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h - src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h - src/BulletCollision/NarrowPhaseCollision/btConvexCast.h - src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h - src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h - src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h - src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h - src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h - src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h - src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h - src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h - src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h - src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h - src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h - src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h - src/BulletCollision/NarrowPhaseCollision/btPointCollector.h - src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h - src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h - src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h - src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h - src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h + src/BulletCollision/BroadphaseCollision/btAxisSweep3.h + src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h + src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h + src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h + src/BulletCollision/BroadphaseCollision/btDbvt.h + src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h + src/BulletCollision/BroadphaseCollision/btDispatcher.h + src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h + src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h + src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h + src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h + src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h + src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h + src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h + src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h + src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h + src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h + src/BulletCollision/CollisionDispatch/btCollisionObject.h + src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h + src/BulletCollision/CollisionDispatch/btCollisionWorld.h + src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h + src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h + src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h + src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h + src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btGhostObject.h + src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h + src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h + src/BulletCollision/CollisionDispatch/btManifoldResult.h + src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h + src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h + src/BulletCollision/CollisionDispatch/btUnionFind.h + src/BulletCollision/CollisionShapes/btBox2dShape.h + src/BulletCollision/CollisionShapes/btBoxShape.h + src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h + src/BulletCollision/CollisionShapes/btCapsuleShape.h + src/BulletCollision/CollisionShapes/btCollisionMargin.h + src/BulletCollision/CollisionShapes/btCollisionShape.h + src/BulletCollision/CollisionShapes/btCompoundShape.h + src/BulletCollision/CollisionShapes/btConcaveShape.h + src/BulletCollision/CollisionShapes/btConeShape.h + src/BulletCollision/CollisionShapes/btConvex2dShape.h + src/BulletCollision/CollisionShapes/btConvexHullShape.h + src/BulletCollision/CollisionShapes/btConvexInternalShape.h + src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h + src/BulletCollision/CollisionShapes/btConvexPolyhedron.h + src/BulletCollision/CollisionShapes/btConvexShape.h + src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h + src/BulletCollision/CollisionShapes/btCylinderShape.h + src/BulletCollision/CollisionShapes/btEmptyShape.h + src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h + src/BulletCollision/CollisionShapes/btMaterial.h + src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h + src/BulletCollision/CollisionShapes/btMultiSphereShape.h + src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h + src/BulletCollision/CollisionShapes/btOptimizedBvh.h + src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h + src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h + src/BulletCollision/CollisionShapes/btShapeHull.h + src/BulletCollision/CollisionShapes/btSphereShape.h + src/BulletCollision/CollisionShapes/btStaticPlaneShape.h + src/BulletCollision/CollisionShapes/btStridingMeshInterface.h + src/BulletCollision/CollisionShapes/btTetrahedronShape.h + src/BulletCollision/CollisionShapes/btTriangleBuffer.h + src/BulletCollision/CollisionShapes/btTriangleCallback.h + src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h + src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h + src/BulletCollision/CollisionShapes/btTriangleInfoMap.h + src/BulletCollision/CollisionShapes/btTriangleMesh.h + src/BulletCollision/CollisionShapes/btTriangleMeshShape.h + src/BulletCollision/CollisionShapes/btTriangleShape.h + src/BulletCollision/CollisionShapes/btUniformScalingShape.h + src/BulletCollision/Gimpact/btBoxCollision.h + src/BulletCollision/Gimpact/btClipPolygon.h + src/BulletCollision/Gimpact/btCompoundFromGimpact.h + src/BulletCollision/Gimpact/btContactProcessing.h + src/BulletCollision/Gimpact/btGImpactBvh.h + src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h + src/BulletCollision/Gimpact/btGImpactMassUtil.h + src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h + src/BulletCollision/Gimpact/btGImpactShape.h + src/BulletCollision/Gimpact/btGenericPoolAllocator.h + src/BulletCollision/Gimpact/btGeometryOperations.h + src/BulletCollision/Gimpact/btQuantization.h + src/BulletCollision/Gimpact/btTriangleShapeEx.h + src/BulletCollision/Gimpact/gim_array.h + src/BulletCollision/Gimpact/gim_basic_geometry_operations.h + src/BulletCollision/Gimpact/gim_bitset.h + src/BulletCollision/Gimpact/gim_box_collision.h + src/BulletCollision/Gimpact/gim_box_set.h + src/BulletCollision/Gimpact/gim_clip_polygon.h + src/BulletCollision/Gimpact/gim_contact.h + src/BulletCollision/Gimpact/gim_geom_types.h + src/BulletCollision/Gimpact/gim_geometry.h + src/BulletCollision/Gimpact/gim_hash_table.h + src/BulletCollision/Gimpact/gim_linear_math.h + src/BulletCollision/Gimpact/gim_math.h + src/BulletCollision/Gimpact/gim_memory.h + src/BulletCollision/Gimpact/gim_radixsort.h + src/BulletCollision/Gimpact/gim_tri_collision.h + src/BulletCollision/NarrowPhaseCollision/btComputeGjkEpaPenetration.h + src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h + src/BulletCollision/NarrowPhaseCollision/btConvexCast.h + src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h + src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h + src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h + src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h + src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h + src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h + src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h + src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h + src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h + src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h + src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h + src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h + src/BulletCollision/NarrowPhaseCollision/btPointCollector.h + src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h + src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h + src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h + src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h + src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h - src/BulletDynamics/Character/btCharacterControllerInterface.h - src/BulletDynamics/Character/btKinematicCharacterController.h - src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h - src/BulletDynamics/ConstraintSolver/btConstraintSolver.h - src/BulletDynamics/ConstraintSolver/btContactConstraint.h - src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h - src/BulletDynamics/ConstraintSolver/btFixedConstraint.h - src/BulletDynamics/ConstraintSolver/btGearConstraint.h - src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h - src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h - src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h - src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h - src/BulletDynamics/ConstraintSolver/btHingeConstraint.h - src/BulletDynamics/ConstraintSolver/btJacobianEntry.h - src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h - src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h - src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h - src/BulletDynamics/ConstraintSolver/btSliderConstraint.h - src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h - src/BulletDynamics/ConstraintSolver/btSolverBody.h - src/BulletDynamics/ConstraintSolver/btSolverConstraint.h - src/BulletDynamics/ConstraintSolver/btTypedConstraint.h - src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h - src/BulletDynamics/Dynamics/btActionInterface.h - src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h - src/BulletDynamics/Dynamics/btDynamicsWorld.h - src/BulletDynamics/Dynamics/btRigidBody.h - src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h - src/BulletDynamics/Featherstone/btMultiBody.h - src/BulletDynamics/Featherstone/btMultiBodyConstraint.h - src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h - src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h - src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h - src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h - src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h - src/BulletDynamics/Featherstone/btMultiBodyLink.h - src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h - src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h - src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h - src/BulletDynamics/MLCPSolvers/btDantzigLCP.h - src/BulletDynamics/MLCPSolvers/btDantzigSolver.h - src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h - src/BulletDynamics/MLCPSolvers/btLemkeSolver.h - src/BulletDynamics/MLCPSolvers/btMLCPSolver.h - src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h - src/BulletDynamics/MLCPSolvers/btPATHSolver.h - src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h - src/BulletDynamics/Vehicle/btRaycastVehicle.h - src/BulletDynamics/Vehicle/btVehicleRaycaster.h - src/BulletDynamics/Vehicle/btWheelInfo.h + src/BulletDynamics/Character/btCharacterControllerInterface.h + src/BulletDynamics/Character/btKinematicCharacterController.h + src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h + src/BulletDynamics/ConstraintSolver/btConstraintSolver.h + src/BulletDynamics/ConstraintSolver/btContactConstraint.h + src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h + src/BulletDynamics/ConstraintSolver/btFixedConstraint.h + src/BulletDynamics/ConstraintSolver/btGearConstraint.h + src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h + src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h + src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h + src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h + src/BulletDynamics/ConstraintSolver/btHingeConstraint.h + src/BulletDynamics/ConstraintSolver/btJacobianEntry.h + src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.h + src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h + src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h + src/BulletDynamics/ConstraintSolver/btSliderConstraint.h + src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h + src/BulletDynamics/ConstraintSolver/btSolverBody.h + src/BulletDynamics/ConstraintSolver/btSolverConstraint.h + src/BulletDynamics/ConstraintSolver/btTypedConstraint.h + src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h + src/BulletDynamics/Dynamics/btActionInterface.h + src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h + src/BulletDynamics/Dynamics/btDynamicsWorld.h + src/BulletDynamics/Dynamics/btRigidBody.h + src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h + src/BulletDynamics/Featherstone/btMultiBody.h + src/BulletDynamics/Featherstone/btMultiBodyConstraint.h + src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h + src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h + src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h + src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h + src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h + src/BulletDynamics/Featherstone/btMultiBodyLink.h + src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h + src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h + src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h + src/BulletDynamics/MLCPSolvers/btDantzigLCP.h + src/BulletDynamics/MLCPSolvers/btDantzigSolver.h + src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h + src/BulletDynamics/MLCPSolvers/btLemkeSolver.h + src/BulletDynamics/MLCPSolvers/btMLCPSolver.h + src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h + src/BulletDynamics/MLCPSolvers/btPATHSolver.h + src/BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h + src/BulletDynamics/Vehicle/btRaycastVehicle.h + src/BulletDynamics/Vehicle/btVehicleRaycaster.h + src/BulletDynamics/Vehicle/btWheelInfo.h - src/BulletSoftBody/btDefaultSoftBodySolver.h - src/BulletSoftBody/btSoftBody.h - src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h - src/BulletSoftBody/btSoftBodyData.h - src/BulletSoftBody/btSoftBodyHelpers.h - src/BulletSoftBody/btSoftBodyInternals.h - src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h - src/BulletSoftBody/btSoftBodySolverVertexBuffer.h - src/BulletSoftBody/btSoftBodySolvers.h - src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h - src/BulletSoftBody/btSoftRigidDynamicsWorld.h - src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h - src/BulletSoftBody/btSparseSDF.h + src/BulletSoftBody/btDefaultSoftBodySolver.h + src/BulletSoftBody/btSoftBody.h + src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h + src/BulletSoftBody/btSoftBodyData.h + src/BulletSoftBody/btSoftBodyHelpers.h + src/BulletSoftBody/btSoftBodyInternals.h + src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h + src/BulletSoftBody/btSoftBodySolverVertexBuffer.h + src/BulletSoftBody/btSoftBodySolvers.h + src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h + src/BulletSoftBody/btSoftRigidDynamicsWorld.h + src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h + src/BulletSoftBody/btSparseSDF.h - src/LinearMath/btAabbUtil2.h - src/LinearMath/btAlignedAllocator.h - src/LinearMath/btAlignedObjectArray.h - src/LinearMath/btConvexHull.h - src/LinearMath/btConvexHullComputer.h - src/LinearMath/btCpuFeatureUtility.h - src/LinearMath/btDefaultMotionState.h - src/LinearMath/btGeometryUtil.h - src/LinearMath/btGrahamScan2dConvexHull.h - src/LinearMath/btHashMap.h - src/LinearMath/btIDebugDraw.h - src/LinearMath/btList.h - src/LinearMath/btMatrix3x3.h - src/LinearMath/btMatrixX.h - src/LinearMath/btMinMax.h - src/LinearMath/btMotionState.h - src/LinearMath/btPolarDecomposition.h - src/LinearMath/btPoolAllocator.h - src/LinearMath/btQuadWord.h - src/LinearMath/btQuaternion.h - src/LinearMath/btQuickprof.h - src/LinearMath/btRandom.h - src/LinearMath/btScalar.h - src/LinearMath/btSerializer.h - src/LinearMath/btSpatialAlgebra.h - src/LinearMath/btStackAlloc.h - src/LinearMath/btTransform.h - src/LinearMath/btTransformUtil.h - src/LinearMath/btVector3.h + src/LinearMath/btAabbUtil2.h + src/LinearMath/btAlignedAllocator.h + src/LinearMath/btAlignedObjectArray.h + src/LinearMath/btConvexHull.h + src/LinearMath/btConvexHullComputer.h + src/LinearMath/btCpuFeatureUtility.h + src/LinearMath/btDefaultMotionState.h + src/LinearMath/btGeometryUtil.h + src/LinearMath/btGrahamScan2dConvexHull.h + src/LinearMath/btHashMap.h + src/LinearMath/btIDebugDraw.h + src/LinearMath/btList.h + src/LinearMath/btMatrix3x3.h + src/LinearMath/btMatrixX.h + src/LinearMath/btMinMax.h + src/LinearMath/btMotionState.h + src/LinearMath/btPolarDecomposition.h + src/LinearMath/btPoolAllocator.h + src/LinearMath/btQuadWord.h + src/LinearMath/btQuaternion.h + src/LinearMath/btQuickprof.h + src/LinearMath/btRandom.h + src/LinearMath/btScalar.h + src/LinearMath/btSerializer.h + src/LinearMath/btSpatialAlgebra.h + src/LinearMath/btStackAlloc.h + src/LinearMath/btTransform.h + src/LinearMath/btTransformUtil.h + src/LinearMath/btVector3.h - src/btBulletCollisionCommon.h - src/btBulletDynamicsCommon.h - src/Bullet-C-Api.h + src/btBulletCollisionCommon.h + src/btBulletDynamicsCommon.h + src/Bullet-C-Api.h ) set(LIB ) if(CMAKE_COMPILER_IS_GNUCXX) - # needed for gcc 4.6+ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") + # needed for gcc 4.6+ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") endif() blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index d91e64b8fd0..bd3d7f7dab4 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -23,291 +23,291 @@ # in that script too set(INC - . - include - internal - config - ../gflags/src + . + include + internal + config + ../gflags/src ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} - ${GFLAGS_INCLUDE_DIRS} - ${GLOG_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${GLOG_INCLUDE_DIRS} ) set(SRC - internal/ceres/array_utils.cc - internal/ceres/blas.cc - internal/ceres/block_evaluate_preparer.cc - internal/ceres/block_jacobian_writer.cc - internal/ceres/block_jacobi_preconditioner.cc - internal/ceres/block_random_access_dense_matrix.cc - internal/ceres/block_random_access_diagonal_matrix.cc - internal/ceres/block_random_access_matrix.cc - internal/ceres/block_random_access_sparse_matrix.cc - internal/ceres/block_sparse_matrix.cc - internal/ceres/block_structure.cc - internal/ceres/callbacks.cc - internal/ceres/c_api.cc - internal/ceres/cgnr_solver.cc - internal/ceres/compressed_col_sparse_matrix_utils.cc - internal/ceres/compressed_row_jacobian_writer.cc - internal/ceres/compressed_row_sparse_matrix.cc - internal/ceres/conditioned_cost_function.cc - internal/ceres/conjugate_gradients_solver.cc - internal/ceres/coordinate_descent_minimizer.cc - internal/ceres/corrector.cc - internal/ceres/covariance.cc - internal/ceres/covariance_impl.cc - internal/ceres/dense_normal_cholesky_solver.cc - internal/ceres/dense_qr_solver.cc - internal/ceres/dense_sparse_matrix.cc - internal/ceres/detect_structure.cc - internal/ceres/dogleg_strategy.cc - internal/ceres/dynamic_compressed_row_jacobian_writer.cc - internal/ceres/dynamic_compressed_row_sparse_matrix.cc - internal/ceres/evaluator.cc - internal/ceres/file.cc - internal/ceres/generated/partitioned_matrix_view_d_d_d.cc - internal/ceres/generated/schur_eliminator_d_d_d.cc - internal/ceres/gradient_checker.cc - internal/ceres/gradient_checking_cost_function.cc - internal/ceres/gradient_problem.cc - internal/ceres/gradient_problem_solver.cc - internal/ceres/implicit_schur_complement.cc - internal/ceres/is_close.cc - internal/ceres/iterative_schur_complement_solver.cc - internal/ceres/lapack.cc - internal/ceres/levenberg_marquardt_strategy.cc - internal/ceres/linear_least_squares_problems.cc - internal/ceres/linear_operator.cc - internal/ceres/linear_solver.cc - internal/ceres/line_search.cc - internal/ceres/line_search_direction.cc - internal/ceres/line_search_minimizer.cc - internal/ceres/line_search_preprocessor.cc - internal/ceres/local_parameterization.cc - internal/ceres/loss_function.cc - internal/ceres/low_rank_inverse_hessian.cc - internal/ceres/minimizer.cc - internal/ceres/normal_prior.cc - internal/ceres/parameter_block_ordering.cc - internal/ceres/partitioned_matrix_view.cc - internal/ceres/polynomial.cc - internal/ceres/preconditioner.cc - internal/ceres/preprocessor.cc - internal/ceres/problem.cc - internal/ceres/problem_impl.cc - internal/ceres/program.cc - internal/ceres/reorder_program.cc - internal/ceres/residual_block.cc - internal/ceres/residual_block_utils.cc - internal/ceres/schur_complement_solver.cc - internal/ceres/schur_eliminator.cc - internal/ceres/schur_jacobi_preconditioner.cc - internal/ceres/scratch_evaluate_preparer.cc - internal/ceres/solver.cc - internal/ceres/solver_utils.cc - internal/ceres/sparse_matrix.cc - internal/ceres/sparse_normal_cholesky_solver.cc - internal/ceres/split.cc - internal/ceres/stringprintf.cc - internal/ceres/triplet_sparse_matrix.cc - internal/ceres/trust_region_minimizer.cc - internal/ceres/trust_region_preprocessor.cc - internal/ceres/trust_region_step_evaluator.cc - internal/ceres/trust_region_strategy.cc - internal/ceres/types.cc - internal/ceres/wall_time.cc + internal/ceres/array_utils.cc + internal/ceres/blas.cc + internal/ceres/block_evaluate_preparer.cc + internal/ceres/block_jacobian_writer.cc + internal/ceres/block_jacobi_preconditioner.cc + internal/ceres/block_random_access_dense_matrix.cc + internal/ceres/block_random_access_diagonal_matrix.cc + internal/ceres/block_random_access_matrix.cc + internal/ceres/block_random_access_sparse_matrix.cc + internal/ceres/block_sparse_matrix.cc + internal/ceres/block_structure.cc + internal/ceres/callbacks.cc + internal/ceres/c_api.cc + internal/ceres/cgnr_solver.cc + internal/ceres/compressed_col_sparse_matrix_utils.cc + internal/ceres/compressed_row_jacobian_writer.cc + internal/ceres/compressed_row_sparse_matrix.cc + internal/ceres/conditioned_cost_function.cc + internal/ceres/conjugate_gradients_solver.cc + internal/ceres/coordinate_descent_minimizer.cc + internal/ceres/corrector.cc + internal/ceres/covariance.cc + internal/ceres/covariance_impl.cc + internal/ceres/dense_normal_cholesky_solver.cc + internal/ceres/dense_qr_solver.cc + internal/ceres/dense_sparse_matrix.cc + internal/ceres/detect_structure.cc + internal/ceres/dogleg_strategy.cc + internal/ceres/dynamic_compressed_row_jacobian_writer.cc + internal/ceres/dynamic_compressed_row_sparse_matrix.cc + internal/ceres/evaluator.cc + internal/ceres/file.cc + internal/ceres/generated/partitioned_matrix_view_d_d_d.cc + internal/ceres/generated/schur_eliminator_d_d_d.cc + internal/ceres/gradient_checker.cc + internal/ceres/gradient_checking_cost_function.cc + internal/ceres/gradient_problem.cc + internal/ceres/gradient_problem_solver.cc + internal/ceres/implicit_schur_complement.cc + internal/ceres/is_close.cc + internal/ceres/iterative_schur_complement_solver.cc + internal/ceres/lapack.cc + internal/ceres/levenberg_marquardt_strategy.cc + internal/ceres/linear_least_squares_problems.cc + internal/ceres/linear_operator.cc + internal/ceres/linear_solver.cc + internal/ceres/line_search.cc + internal/ceres/line_search_direction.cc + internal/ceres/line_search_minimizer.cc + internal/ceres/line_search_preprocessor.cc + internal/ceres/local_parameterization.cc + internal/ceres/loss_function.cc + internal/ceres/low_rank_inverse_hessian.cc + internal/ceres/minimizer.cc + internal/ceres/normal_prior.cc + internal/ceres/parameter_block_ordering.cc + internal/ceres/partitioned_matrix_view.cc + internal/ceres/polynomial.cc + internal/ceres/preconditioner.cc + internal/ceres/preprocessor.cc + internal/ceres/problem.cc + internal/ceres/problem_impl.cc + internal/ceres/program.cc + internal/ceres/reorder_program.cc + internal/ceres/residual_block.cc + internal/ceres/residual_block_utils.cc + internal/ceres/schur_complement_solver.cc + internal/ceres/schur_eliminator.cc + internal/ceres/schur_jacobi_preconditioner.cc + internal/ceres/scratch_evaluate_preparer.cc + internal/ceres/solver.cc + internal/ceres/solver_utils.cc + internal/ceres/sparse_matrix.cc + internal/ceres/sparse_normal_cholesky_solver.cc + internal/ceres/split.cc + internal/ceres/stringprintf.cc + internal/ceres/triplet_sparse_matrix.cc + internal/ceres/trust_region_minimizer.cc + internal/ceres/trust_region_preprocessor.cc + internal/ceres/trust_region_step_evaluator.cc + internal/ceres/trust_region_strategy.cc + internal/ceres/types.cc + internal/ceres/wall_time.cc - include/ceres/autodiff_cost_function.h - include/ceres/autodiff_local_parameterization.h - include/ceres/c_api.h - include/ceres/ceres.h - include/ceres/conditioned_cost_function.h - include/ceres/cost_function.h - include/ceres/cost_function_to_functor.h - include/ceres/covariance.h - include/ceres/crs_matrix.h - include/ceres/dynamic_autodiff_cost_function.h - include/ceres/dynamic_cost_function_to_functor.h - include/ceres/dynamic_numeric_diff_cost_function.h - include/ceres/fpclassify.h - include/ceres/gradient_checker.h - include/ceres/gradient_problem.h - include/ceres/gradient_problem_solver.h - include/ceres/internal/autodiff.h - include/ceres/internal/disable_warnings.h - include/ceres/internal/eigen.h - include/ceres/internal/fixed_array.h - include/ceres/internal/macros.h - include/ceres/internal/manual_constructor.h - include/ceres/internal/numeric_diff.h - include/ceres/internal/port.h - include/ceres/internal/reenable_warnings.h - include/ceres/internal/scoped_ptr.h - include/ceres/internal/variadic_evaluate.h - include/ceres/iteration_callback.h - include/ceres/jet.h - include/ceres/local_parameterization.h - include/ceres/loss_function.h - include/ceres/normal_prior.h - include/ceres/numeric_diff_cost_function.h - include/ceres/numeric_diff_options.h - include/ceres/ordered_groups.h - include/ceres/problem.h - include/ceres/rotation.h - include/ceres/sized_cost_function.h - include/ceres/solver.h - include/ceres/types.h - include/ceres/version.h - internal/ceres/array_utils.h - internal/ceres/blas.h - internal/ceres/block_evaluate_preparer.h - internal/ceres/block_jacobian_writer.h - internal/ceres/block_jacobi_preconditioner.h - internal/ceres/block_random_access_dense_matrix.h - internal/ceres/block_random_access_diagonal_matrix.h - internal/ceres/block_random_access_matrix.h - internal/ceres/block_random_access_sparse_matrix.h - internal/ceres/block_sparse_matrix.h - internal/ceres/block_structure.h - internal/ceres/callbacks.h - internal/ceres/casts.h - internal/ceres/cgnr_linear_operator.h - internal/ceres/cgnr_solver.h - internal/ceres/collections_port.h - internal/ceres/compressed_col_sparse_matrix_utils.h - internal/ceres/compressed_row_jacobian_writer.h - internal/ceres/compressed_row_sparse_matrix.h - internal/ceres/conjugate_gradients_solver.h - internal/ceres/coordinate_descent_minimizer.h - internal/ceres/corrector.h - internal/ceres/covariance_impl.h - internal/ceres/cxsparse.h - internal/ceres/dense_jacobian_writer.h - internal/ceres/dense_normal_cholesky_solver.h - internal/ceres/dense_qr_solver.h - internal/ceres/dense_sparse_matrix.h - internal/ceres/detect_structure.h - internal/ceres/dogleg_strategy.h - internal/ceres/dynamic_compressed_row_finalizer.h - internal/ceres/dynamic_compressed_row_jacobian_writer.h - internal/ceres/dynamic_compressed_row_sparse_matrix.h - internal/ceres/evaluator.h - internal/ceres/execution_summary.h - internal/ceres/file.h - internal/ceres/gradient_checking_cost_function.h - internal/ceres/gradient_problem_evaluator.h - internal/ceres/graph_algorithms.h - internal/ceres/graph.h - internal/ceres/householder_vector.h - internal/ceres/implicit_schur_complement.h - internal/ceres/integral_types.h - internal/ceres/is_close.h - internal/ceres/iterative_schur_complement_solver.h - internal/ceres/lapack.h - internal/ceres/levenberg_marquardt_strategy.h - internal/ceres/linear_least_squares_problems.h - internal/ceres/linear_operator.h - internal/ceres/linear_solver.h - internal/ceres/line_search_direction.h - internal/ceres/line_search.h - internal/ceres/line_search_minimizer.h - internal/ceres/line_search_preprocessor.h - internal/ceres/low_rank_inverse_hessian.h - internal/ceres/map_util.h - internal/ceres/minimizer.h - internal/ceres/mutex.h - internal/ceres/parameter_block.h - internal/ceres/parameter_block_ordering.h - internal/ceres/partitioned_matrix_view.h - internal/ceres/partitioned_matrix_view_impl.h - internal/ceres/polynomial.h - internal/ceres/preconditioner.h - internal/ceres/preprocessor.h - internal/ceres/problem_impl.h - internal/ceres/program_evaluator.h - internal/ceres/program.h - internal/ceres/random.h - internal/ceres/reorder_program.h - internal/ceres/residual_block.h - internal/ceres/residual_block_utils.h - internal/ceres/schur_complement_solver.h - internal/ceres/schur_eliminator.h - internal/ceres/schur_eliminator_impl.h - internal/ceres/schur_jacobi_preconditioner.h - internal/ceres/scratch_evaluate_preparer.h - internal/ceres/small_blas.h - internal/ceres/solver_utils.h - internal/ceres/sparse_matrix.h - internal/ceres/sparse_normal_cholesky_solver.h - internal/ceres/split.h - internal/ceres/stl_util.h - internal/ceres/stringprintf.h - internal/ceres/suitesparse.h - internal/ceres/triplet_sparse_matrix.h - internal/ceres/trust_region_minimizer.h - internal/ceres/trust_region_preprocessor.h - internal/ceres/trust_region_step_evaluator.h - internal/ceres/trust_region_strategy.h - internal/ceres/visibility_based_preconditioner.h - internal/ceres/wall_time.h + include/ceres/autodiff_cost_function.h + include/ceres/autodiff_local_parameterization.h + include/ceres/c_api.h + include/ceres/ceres.h + include/ceres/conditioned_cost_function.h + include/ceres/cost_function.h + include/ceres/cost_function_to_functor.h + include/ceres/covariance.h + include/ceres/crs_matrix.h + include/ceres/dynamic_autodiff_cost_function.h + include/ceres/dynamic_cost_function_to_functor.h + include/ceres/dynamic_numeric_diff_cost_function.h + include/ceres/fpclassify.h + include/ceres/gradient_checker.h + include/ceres/gradient_problem.h + include/ceres/gradient_problem_solver.h + include/ceres/internal/autodiff.h + include/ceres/internal/disable_warnings.h + include/ceres/internal/eigen.h + include/ceres/internal/fixed_array.h + include/ceres/internal/macros.h + include/ceres/internal/manual_constructor.h + include/ceres/internal/numeric_diff.h + include/ceres/internal/port.h + include/ceres/internal/reenable_warnings.h + include/ceres/internal/scoped_ptr.h + include/ceres/internal/variadic_evaluate.h + include/ceres/iteration_callback.h + include/ceres/jet.h + include/ceres/local_parameterization.h + include/ceres/loss_function.h + include/ceres/normal_prior.h + include/ceres/numeric_diff_cost_function.h + include/ceres/numeric_diff_options.h + include/ceres/ordered_groups.h + include/ceres/problem.h + include/ceres/rotation.h + include/ceres/sized_cost_function.h + include/ceres/solver.h + include/ceres/types.h + include/ceres/version.h + internal/ceres/array_utils.h + internal/ceres/blas.h + internal/ceres/block_evaluate_preparer.h + internal/ceres/block_jacobian_writer.h + internal/ceres/block_jacobi_preconditioner.h + internal/ceres/block_random_access_dense_matrix.h + internal/ceres/block_random_access_diagonal_matrix.h + internal/ceres/block_random_access_matrix.h + internal/ceres/block_random_access_sparse_matrix.h + internal/ceres/block_sparse_matrix.h + internal/ceres/block_structure.h + internal/ceres/callbacks.h + internal/ceres/casts.h + internal/ceres/cgnr_linear_operator.h + internal/ceres/cgnr_solver.h + internal/ceres/collections_port.h + internal/ceres/compressed_col_sparse_matrix_utils.h + internal/ceres/compressed_row_jacobian_writer.h + internal/ceres/compressed_row_sparse_matrix.h + internal/ceres/conjugate_gradients_solver.h + internal/ceres/coordinate_descent_minimizer.h + internal/ceres/corrector.h + internal/ceres/covariance_impl.h + internal/ceres/cxsparse.h + internal/ceres/dense_jacobian_writer.h + internal/ceres/dense_normal_cholesky_solver.h + internal/ceres/dense_qr_solver.h + internal/ceres/dense_sparse_matrix.h + internal/ceres/detect_structure.h + internal/ceres/dogleg_strategy.h + internal/ceres/dynamic_compressed_row_finalizer.h + internal/ceres/dynamic_compressed_row_jacobian_writer.h + internal/ceres/dynamic_compressed_row_sparse_matrix.h + internal/ceres/evaluator.h + internal/ceres/execution_summary.h + internal/ceres/file.h + internal/ceres/gradient_checking_cost_function.h + internal/ceres/gradient_problem_evaluator.h + internal/ceres/graph_algorithms.h + internal/ceres/graph.h + internal/ceres/householder_vector.h + internal/ceres/implicit_schur_complement.h + internal/ceres/integral_types.h + internal/ceres/is_close.h + internal/ceres/iterative_schur_complement_solver.h + internal/ceres/lapack.h + internal/ceres/levenberg_marquardt_strategy.h + internal/ceres/linear_least_squares_problems.h + internal/ceres/linear_operator.h + internal/ceres/linear_solver.h + internal/ceres/line_search_direction.h + internal/ceres/line_search.h + internal/ceres/line_search_minimizer.h + internal/ceres/line_search_preprocessor.h + internal/ceres/low_rank_inverse_hessian.h + internal/ceres/map_util.h + internal/ceres/minimizer.h + internal/ceres/mutex.h + internal/ceres/parameter_block.h + internal/ceres/parameter_block_ordering.h + internal/ceres/partitioned_matrix_view.h + internal/ceres/partitioned_matrix_view_impl.h + internal/ceres/polynomial.h + internal/ceres/preconditioner.h + internal/ceres/preprocessor.h + internal/ceres/problem_impl.h + internal/ceres/program_evaluator.h + internal/ceres/program.h + internal/ceres/random.h + internal/ceres/reorder_program.h + internal/ceres/residual_block.h + internal/ceres/residual_block_utils.h + internal/ceres/schur_complement_solver.h + internal/ceres/schur_eliminator.h + internal/ceres/schur_eliminator_impl.h + internal/ceres/schur_jacobi_preconditioner.h + internal/ceres/scratch_evaluate_preparer.h + internal/ceres/small_blas.h + internal/ceres/solver_utils.h + internal/ceres/sparse_matrix.h + internal/ceres/sparse_normal_cholesky_solver.h + internal/ceres/split.h + internal/ceres/stl_util.h + internal/ceres/stringprintf.h + internal/ceres/suitesparse.h + internal/ceres/triplet_sparse_matrix.h + internal/ceres/trust_region_minimizer.h + internal/ceres/trust_region_preprocessor.h + internal/ceres/trust_region_step_evaluator.h + internal/ceres/trust_region_strategy.h + internal/ceres/visibility_based_preconditioner.h + internal/ceres/wall_time.h ) set(LIB ) if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) - list(APPEND LIB - extern_glog - ) + list(APPEND LIB + extern_glog + ) endif() if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) - list(APPEND SRC - internal/ceres/generated/partitioned_matrix_view_2_2_2.cc - internal/ceres/generated/partitioned_matrix_view_2_2_3.cc - internal/ceres/generated/partitioned_matrix_view_2_2_4.cc - internal/ceres/generated/partitioned_matrix_view_2_2_d.cc - internal/ceres/generated/partitioned_matrix_view_2_3_3.cc - internal/ceres/generated/partitioned_matrix_view_2_3_4.cc - internal/ceres/generated/partitioned_matrix_view_2_3_6.cc - internal/ceres/generated/partitioned_matrix_view_2_3_9.cc - internal/ceres/generated/partitioned_matrix_view_2_3_d.cc - internal/ceres/generated/partitioned_matrix_view_2_4_3.cc - internal/ceres/generated/partitioned_matrix_view_2_4_4.cc - internal/ceres/generated/partitioned_matrix_view_2_4_8.cc - internal/ceres/generated/partitioned_matrix_view_2_4_9.cc - internal/ceres/generated/partitioned_matrix_view_2_4_d.cc - internal/ceres/generated/partitioned_matrix_view_2_d_d.cc - internal/ceres/generated/partitioned_matrix_view_4_4_2.cc - internal/ceres/generated/partitioned_matrix_view_4_4_3.cc - internal/ceres/generated/partitioned_matrix_view_4_4_4.cc - internal/ceres/generated/partitioned_matrix_view_4_4_d.cc - internal/ceres/generated/schur_eliminator_2_2_2.cc - internal/ceres/generated/schur_eliminator_2_2_3.cc - internal/ceres/generated/schur_eliminator_2_2_4.cc - internal/ceres/generated/schur_eliminator_2_2_d.cc - internal/ceres/generated/schur_eliminator_2_3_3.cc - internal/ceres/generated/schur_eliminator_2_3_4.cc - internal/ceres/generated/schur_eliminator_2_3_6.cc - internal/ceres/generated/schur_eliminator_2_3_9.cc - internal/ceres/generated/schur_eliminator_2_3_d.cc - internal/ceres/generated/schur_eliminator_2_4_3.cc - internal/ceres/generated/schur_eliminator_2_4_4.cc - internal/ceres/generated/schur_eliminator_2_4_8.cc - internal/ceres/generated/schur_eliminator_2_4_9.cc - internal/ceres/generated/schur_eliminator_2_4_d.cc - internal/ceres/generated/schur_eliminator_2_d_d.cc - internal/ceres/generated/schur_eliminator_4_4_2.cc - internal/ceres/generated/schur_eliminator_4_4_3.cc - internal/ceres/generated/schur_eliminator_4_4_4.cc - internal/ceres/generated/schur_eliminator_4_4_d.cc - ) + list(APPEND SRC + internal/ceres/generated/partitioned_matrix_view_2_2_2.cc + internal/ceres/generated/partitioned_matrix_view_2_2_3.cc + internal/ceres/generated/partitioned_matrix_view_2_2_4.cc + internal/ceres/generated/partitioned_matrix_view_2_2_d.cc + internal/ceres/generated/partitioned_matrix_view_2_3_3.cc + internal/ceres/generated/partitioned_matrix_view_2_3_4.cc + internal/ceres/generated/partitioned_matrix_view_2_3_6.cc + internal/ceres/generated/partitioned_matrix_view_2_3_9.cc + internal/ceres/generated/partitioned_matrix_view_2_3_d.cc + internal/ceres/generated/partitioned_matrix_view_2_4_3.cc + internal/ceres/generated/partitioned_matrix_view_2_4_4.cc + internal/ceres/generated/partitioned_matrix_view_2_4_8.cc + internal/ceres/generated/partitioned_matrix_view_2_4_9.cc + internal/ceres/generated/partitioned_matrix_view_2_4_d.cc + internal/ceres/generated/partitioned_matrix_view_2_d_d.cc + internal/ceres/generated/partitioned_matrix_view_4_4_2.cc + internal/ceres/generated/partitioned_matrix_view_4_4_3.cc + internal/ceres/generated/partitioned_matrix_view_4_4_4.cc + internal/ceres/generated/partitioned_matrix_view_4_4_d.cc + internal/ceres/generated/schur_eliminator_2_2_2.cc + internal/ceres/generated/schur_eliminator_2_2_3.cc + internal/ceres/generated/schur_eliminator_2_2_4.cc + internal/ceres/generated/schur_eliminator_2_2_d.cc + internal/ceres/generated/schur_eliminator_2_3_3.cc + internal/ceres/generated/schur_eliminator_2_3_4.cc + internal/ceres/generated/schur_eliminator_2_3_6.cc + internal/ceres/generated/schur_eliminator_2_3_9.cc + internal/ceres/generated/schur_eliminator_2_3_d.cc + internal/ceres/generated/schur_eliminator_2_4_3.cc + internal/ceres/generated/schur_eliminator_2_4_4.cc + internal/ceres/generated/schur_eliminator_2_4_8.cc + internal/ceres/generated/schur_eliminator_2_4_9.cc + internal/ceres/generated/schur_eliminator_2_4_d.cc + internal/ceres/generated/schur_eliminator_2_d_d.cc + internal/ceres/generated/schur_eliminator_4_4_2.cc + internal/ceres/generated/schur_eliminator_4_4_3.cc + internal/ceres/generated/schur_eliminator_4_4_4.cc + internal/ceres/generated/schur_eliminator_4_4_d.cc + ) else() - add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) + add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) endif() add_definitions(${GFLAGS_DEFINES}) @@ -315,17 +315,17 @@ add_definitions(${GLOG_DEFINES}) add_definitions(${CERES_DEFINES}) add_definitions( - -DCERES_HAVE_PTHREAD - -DCERES_NO_SUITESPARSE - -DCERES_NO_CXSPARSE - -DCERES_NO_LAPACK - -DCERES_HAVE_RWLOCK + -DCERES_HAVE_PTHREAD + -DCERES_NO_SUITESPARSE + -DCERES_NO_CXSPARSE + -DCERES_NO_LAPACK + -DCERES_HAVE_RWLOCK ) if(WITH_OPENMP) - add_definitions( - -DCERES_USE_OPENMP - ) + add_definitions( + -DCERES_USE_OPENMP + ) endif() blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh index 561e2b404c1..bf5a43852b5 100755 --- a/extern/ceres/bundle.sh +++ b/extern/ceres/bundle.sh @@ -116,17 +116,17 @@ cat > CMakeLists.txt << EOF # in that script too set(INC - . - include - internal - config - ../gflags/src + . + include + internal + config + ../gflags/src ) set(INC_SYS - \${EIGEN3_INCLUDE_DIRS} - \${GFLAGS_INCLUDE_DIRS} - \${GLOG_INCLUDE_DIRS} + \${EIGEN3_INCLUDE_DIRS} + \${GFLAGS_INCLUDE_DIRS} + \${GLOG_INCLUDE_DIRS} ) set(SRC @@ -136,15 +136,15 @@ ${headers} ) set(LIB - extern_glog + extern_glog ) if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) - list(APPEND SRC + list(APPEND SRC ${generated_sources} - ) + ) else() - add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) + add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION) endif() add_definitions(\${GFLAGS_DEFINES}) @@ -152,17 +152,17 @@ add_definitions(\${GLOG_DEFINES}) add_definitions(\${CERES_DEFINES}) add_definitions( - -DCERES_HAVE_PTHREAD - -DCERES_NO_SUITESPARSE - -DCERES_NO_CXSPARSE - -DCERES_NO_LAPACK - -DCERES_HAVE_RWLOCK + -DCERES_HAVE_PTHREAD + -DCERES_NO_SUITESPARSE + -DCERES_NO_CXSPARSE + -DCERES_NO_LAPACK + -DCERES_HAVE_RWLOCK ) if(WITH_OPENMP) - add_definitions( - -DCERES_USE_OPENMP - ) + add_definitions( + -DCERES_USE_OPENMP + ) endif() blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}") diff --git a/extern/clew/CMakeLists.txt b/extern/clew/CMakeLists.txt index 806771cb7f4..cffbf4e855f 100644 --- a/extern/clew/CMakeLists.txt +++ b/extern/clew/CMakeLists.txt @@ -19,8 +19,8 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . - include + . + include ) set(INC_SYS @@ -28,8 +28,8 @@ set(INC_SYS ) set(SRC - include/clew.h - src/clew.c + include/clew.h + src/clew.c ) set(LIB diff --git a/extern/cuew/CMakeLists.txt b/extern/cuew/CMakeLists.txt index 45d10e29799..de54d9642ce 100644 --- a/extern/cuew/CMakeLists.txt +++ b/extern/cuew/CMakeLists.txt @@ -19,8 +19,8 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . - include + . + include ) set(INC_SYS @@ -28,9 +28,9 @@ set(INC_SYS ) set(SRC - src/cuew.c + src/cuew.c - include/cuew.h + include/cuew.h ) set(LIB diff --git a/extern/curve_fit_nd/CMakeLists.txt b/extern/curve_fit_nd/CMakeLists.txt index f9264f9b890..11b16c8fa8a 100644 --- a/extern/curve_fit_nd/CMakeLists.txt +++ b/extern/curve_fit_nd/CMakeLists.txt @@ -17,7 +17,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . + . ) set(INC_SYS @@ -25,15 +25,15 @@ set(INC_SYS ) set(SRC - intern/curve_fit_cubic.c - intern/curve_fit_cubic_refit.c - intern/curve_fit_corners_detect.c + intern/curve_fit_cubic.c + intern/curve_fit_cubic_refit.c + intern/curve_fit_corners_detect.c - curve_fit_nd.h - intern/curve_fit_inline.h - intern/generic_alloc_impl.h - intern/generic_heap.c - intern/generic_heap.h + curve_fit_nd.h + intern/curve_fit_inline.h + intern/generic_alloc_impl.h + intern/generic_heap.c + intern/generic_heap.h ) set(LIB diff --git a/extern/draco/dracoenc/CMakeLists.txt b/extern/draco/dracoenc/CMakeLists.txt index 04f54ab9293..3d33bdb74c2 100644 --- a/extern/draco/dracoenc/CMakeLists.txt +++ b/extern/draco/dracoenc/CMakeLists.txt @@ -1,188 +1,188 @@ remove_strict_flags() set(SRC - src/draco/animation/keyframe_animation.cc - src/draco/animation/keyframe_animation_encoder.cc - src/draco/animation/keyframe_animation_encoder.h - src/draco/animation/keyframe_animation.h - src/draco/attributes/attribute_octahedron_transform.cc - src/draco/attributes/attribute_octahedron_transform.h - src/draco/attributes/attribute_quantization_transform.cc - src/draco/attributes/attribute_quantization_transform.h - src/draco/attributes/attribute_transform.cc - src/draco/attributes/attribute_transform_data.h - src/draco/attributes/attribute_transform.h - src/draco/attributes/attribute_transform_type.h - src/draco/attributes/geometry_attribute.cc - src/draco/attributes/geometry_attribute.h - src/draco/attributes/geometry_indices.h - src/draco/attributes/point_attribute.cc - src/draco/attributes/point_attribute.h - src/draco/compression/attributes/attributes_encoder.cc - src/draco/compression/attributes/attributes_encoder.h - src/draco/compression/attributes/kd_tree_attributes_encoder.cc - src/draco/compression/attributes/kd_tree_attributes_encoder.h - src/draco/compression/attributes/linear_sequencer.h - src/draco/compression/attributes/points_sequencer.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_shared.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_data.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_predictor_area.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_predictor_base.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_shared.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h - src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_delta_encoder.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc - src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_interface.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoding_transform.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_factory.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_interface.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_encoding_transform.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_base.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_encoding_transform.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_base.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_encoding_transform.h - src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h - src/draco/compression/attributes/sequential_attribute_encoder.cc - src/draco/compression/attributes/sequential_attribute_encoder.h - src/draco/compression/attributes/sequential_attribute_encoders_controller.cc - src/draco/compression/attributes/sequential_attribute_encoders_controller.h - src/draco/compression/attributes/sequential_integer_attribute_encoder.cc - src/draco/compression/attributes/sequential_integer_attribute_encoder.h - src/draco/compression/attributes/sequential_normal_attribute_encoder.cc - src/draco/compression/attributes/sequential_normal_attribute_encoder.h - src/draco/compression/attributes/sequential_quantization_attribute_encoder.cc - src/draco/compression/attributes/sequential_quantization_attribute_encoder.h - src/draco/compression/bit_coders/adaptive_rans_bit_coding_shared.h - src/draco/compression/bit_coders/adaptive_rans_bit_encoder.cc - src/draco/compression/bit_coders/adaptive_rans_bit_encoder.h - src/draco/compression/bit_coders/direct_bit_encoder.cc - src/draco/compression/bit_coders/direct_bit_encoder.h - src/draco/compression/bit_coders/folded_integer_bit_encoder.h - src/draco/compression/bit_coders/rans_bit_encoder.cc - src/draco/compression/bit_coders/rans_bit_encoder.h - src/draco/compression/bit_coders/symbol_bit_encoder.cc - src/draco/compression/bit_coders/symbol_bit_encoder.h - src/draco/compression/config/compression_shared.h - src/draco/compression/config/draco_options.h - src/draco/compression/config/encoder_options.h - src/draco/compression/config/encoding_features.h - src/draco/compression/encode_base.h - src/draco/compression/encode.cc - src/draco/compression/encode.h - src/draco/compression/entropy/ans.h - src/draco/compression/entropy/rans_symbol_coding.h - src/draco/compression/entropy/rans_symbol_encoder.h - src/draco/compression/entropy/shannon_entropy.cc - src/draco/compression/entropy/shannon_entropy.h - src/draco/compression/entropy/symbol_encoding.cc - src/draco/compression/entropy/symbol_encoding.h - src/draco/compression/expert_encode.cc - src/draco/compression/expert_encode.h - src/draco/compression/mesh/mesh_edgebreaker_encoder.cc - src/draco/compression/mesh/mesh_edgebreaker_encoder.h - src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc - src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h - src/draco/compression/mesh/mesh_edgebreaker_encoder_impl_interface.h - src/draco/compression/mesh/mesh_edgebreaker_shared.h - src/draco/compression/mesh/mesh_edgebreaker_traversal_encoder.h - src/draco/compression/mesh/mesh_edgebreaker_traversal_predictive_encoder.h - src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_encoder.h - src/draco/compression/mesh/mesh_encoder.cc - src/draco/compression/mesh/mesh_encoder.h - src/draco/compression/mesh/mesh_encoder_helpers.h - src/draco/compression/mesh/mesh_sequential_encoder.cc - src/draco/compression/mesh/mesh_sequential_encoder.h - src/draco/compression/mesh/traverser/depth_first_traverser.h - src/draco/compression/mesh/traverser/max_prediction_degree_traverser.h - src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h - src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h - src/draco/compression/mesh/traverser/traverser_base.h - src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_encoder.cc - src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_encoder.h - src/draco/compression/point_cloud/algorithms/float_points_tree_encoder.cc - src/draco/compression/point_cloud/algorithms/float_points_tree_encoder.h - src/draco/compression/point_cloud/algorithms/point_cloud_compression_method.h - src/draco/compression/point_cloud/algorithms/point_cloud_types.h - src/draco/compression/point_cloud/algorithms/quantize_points_3.h - src/draco/compression/point_cloud/algorithms/queuing_policy.h - src/draco/compression/point_cloud/point_cloud_encoder.cc - src/draco/compression/point_cloud/point_cloud_encoder.h - src/draco/compression/point_cloud/point_cloud_kd_tree_encoder.cc - src/draco/compression/point_cloud/point_cloud_kd_tree_encoder.h - src/draco/compression/point_cloud/point_cloud_sequential_encoder.cc - src/draco/compression/point_cloud/point_cloud_sequential_encoder.h - src/draco/core/bit_utils.cc - src/draco/core/bit_utils.h - src/draco/core/bounding_box.cc - src/draco/core/bounding_box.h - src/draco/core/cycle_timer.cc - src/draco/core/cycle_timer.h - src/draco/core/data_buffer.cc - src/draco/core/data_buffer.h - src/draco/core/divide.cc - src/draco/core/divide.h - src/draco/core/draco_index_type.h - src/draco/core/draco_index_type_vector.h - src/draco/core/draco_types.cc - src/draco/core/draco_types.h - src/draco/core/encoder_buffer.cc - src/draco/core/encoder_buffer.h - src/draco/core/hash_utils.cc - src/draco/core/hash_utils.h - src/draco/core/macros.h - src/draco/core/math_utils.h - src/draco/core/options.cc - src/draco/core/options.h - src/draco/core/quantization_utils.cc - src/draco/core/quantization_utils.h - src/draco/core/status.h - src/draco/core/statusor.h - src/draco/core/varint_encoding.h - src/draco/core/vector_d.h - src/draco/mesh/corner_table.cc - src/draco/mesh/corner_table.h - src/draco/mesh/corner_table_iterators.h - src/draco/mesh/mesh_are_equivalent.cc - src/draco/mesh/mesh_are_equivalent.h - src/draco/mesh/mesh_attribute_corner_table.cc - src/draco/mesh/mesh_attribute_corner_table.h - src/draco/mesh/mesh.cc - src/draco/mesh/mesh_cleanup.cc - src/draco/mesh/mesh_cleanup.h - src/draco/mesh/mesh.h - src/draco/mesh/mesh_misc_functions.cc - src/draco/mesh/mesh_misc_functions.h - src/draco/mesh/mesh_stripifier.cc - src/draco/mesh/mesh_stripifier.h - src/draco/mesh/triangle_soup_mesh_builder.cc - src/draco/mesh/triangle_soup_mesh_builder.h - src/draco/mesh/valence_cache.h - src/draco/metadata/geometry_metadata.cc - src/draco/metadata/geometry_metadata.h - src/draco/metadata/metadata.cc - src/draco/metadata/metadata_encoder.cc - src/draco/metadata/metadata_encoder.h - src/draco/metadata/metadata.h - src/draco/point_cloud/point_cloud_builder.cc - src/draco/point_cloud/point_cloud_builder.h - src/draco/point_cloud/point_cloud.cc - src/draco/point_cloud/point_cloud.h + src/draco/animation/keyframe_animation.cc + src/draco/animation/keyframe_animation_encoder.cc + src/draco/animation/keyframe_animation_encoder.h + src/draco/animation/keyframe_animation.h + src/draco/attributes/attribute_octahedron_transform.cc + src/draco/attributes/attribute_octahedron_transform.h + src/draco/attributes/attribute_quantization_transform.cc + src/draco/attributes/attribute_quantization_transform.h + src/draco/attributes/attribute_transform.cc + src/draco/attributes/attribute_transform_data.h + src/draco/attributes/attribute_transform.h + src/draco/attributes/attribute_transform_type.h + src/draco/attributes/geometry_attribute.cc + src/draco/attributes/geometry_attribute.h + src/draco/attributes/geometry_indices.h + src/draco/attributes/point_attribute.cc + src/draco/attributes/point_attribute.h + src/draco/compression/attributes/attributes_encoder.cc + src/draco/compression/attributes/attributes_encoder.h + src/draco/compression/attributes/kd_tree_attributes_encoder.cc + src/draco/compression/attributes/kd_tree_attributes_encoder.h + src/draco/compression/attributes/linear_sequencer.h + src/draco/compression/attributes/points_sequencer.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_shared.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_data.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_predictor_area.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_predictor_base.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_shared.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h + src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_delta_encoder.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc + src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_interface.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoding_transform.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_factory.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_interface.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_encoding_transform.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_base.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_encoding_transform.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_base.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_encoding_transform.h + src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h + src/draco/compression/attributes/sequential_attribute_encoder.cc + src/draco/compression/attributes/sequential_attribute_encoder.h + src/draco/compression/attributes/sequential_attribute_encoders_controller.cc + src/draco/compression/attributes/sequential_attribute_encoders_controller.h + src/draco/compression/attributes/sequential_integer_attribute_encoder.cc + src/draco/compression/attributes/sequential_integer_attribute_encoder.h + src/draco/compression/attributes/sequential_normal_attribute_encoder.cc + src/draco/compression/attributes/sequential_normal_attribute_encoder.h + src/draco/compression/attributes/sequential_quantization_attribute_encoder.cc + src/draco/compression/attributes/sequential_quantization_attribute_encoder.h + src/draco/compression/bit_coders/adaptive_rans_bit_coding_shared.h + src/draco/compression/bit_coders/adaptive_rans_bit_encoder.cc + src/draco/compression/bit_coders/adaptive_rans_bit_encoder.h + src/draco/compression/bit_coders/direct_bit_encoder.cc + src/draco/compression/bit_coders/direct_bit_encoder.h + src/draco/compression/bit_coders/folded_integer_bit_encoder.h + src/draco/compression/bit_coders/rans_bit_encoder.cc + src/draco/compression/bit_coders/rans_bit_encoder.h + src/draco/compression/bit_coders/symbol_bit_encoder.cc + src/draco/compression/bit_coders/symbol_bit_encoder.h + src/draco/compression/config/compression_shared.h + src/draco/compression/config/draco_options.h + src/draco/compression/config/encoder_options.h + src/draco/compression/config/encoding_features.h + src/draco/compression/encode_base.h + src/draco/compression/encode.cc + src/draco/compression/encode.h + src/draco/compression/entropy/ans.h + src/draco/compression/entropy/rans_symbol_coding.h + src/draco/compression/entropy/rans_symbol_encoder.h + src/draco/compression/entropy/shannon_entropy.cc + src/draco/compression/entropy/shannon_entropy.h + src/draco/compression/entropy/symbol_encoding.cc + src/draco/compression/entropy/symbol_encoding.h + src/draco/compression/expert_encode.cc + src/draco/compression/expert_encode.h + src/draco/compression/mesh/mesh_edgebreaker_encoder.cc + src/draco/compression/mesh/mesh_edgebreaker_encoder.h + src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc + src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h + src/draco/compression/mesh/mesh_edgebreaker_encoder_impl_interface.h + src/draco/compression/mesh/mesh_edgebreaker_shared.h + src/draco/compression/mesh/mesh_edgebreaker_traversal_encoder.h + src/draco/compression/mesh/mesh_edgebreaker_traversal_predictive_encoder.h + src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_encoder.h + src/draco/compression/mesh/mesh_encoder.cc + src/draco/compression/mesh/mesh_encoder.h + src/draco/compression/mesh/mesh_encoder_helpers.h + src/draco/compression/mesh/mesh_sequential_encoder.cc + src/draco/compression/mesh/mesh_sequential_encoder.h + src/draco/compression/mesh/traverser/depth_first_traverser.h + src/draco/compression/mesh/traverser/max_prediction_degree_traverser.h + src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h + src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h + src/draco/compression/mesh/traverser/traverser_base.h + src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_encoder.cc + src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_encoder.h + src/draco/compression/point_cloud/algorithms/float_points_tree_encoder.cc + src/draco/compression/point_cloud/algorithms/float_points_tree_encoder.h + src/draco/compression/point_cloud/algorithms/point_cloud_compression_method.h + src/draco/compression/point_cloud/algorithms/point_cloud_types.h + src/draco/compression/point_cloud/algorithms/quantize_points_3.h + src/draco/compression/point_cloud/algorithms/queuing_policy.h + src/draco/compression/point_cloud/point_cloud_encoder.cc + src/draco/compression/point_cloud/point_cloud_encoder.h + src/draco/compression/point_cloud/point_cloud_kd_tree_encoder.cc + src/draco/compression/point_cloud/point_cloud_kd_tree_encoder.h + src/draco/compression/point_cloud/point_cloud_sequential_encoder.cc + src/draco/compression/point_cloud/point_cloud_sequential_encoder.h + src/draco/core/bit_utils.cc + src/draco/core/bit_utils.h + src/draco/core/bounding_box.cc + src/draco/core/bounding_box.h + src/draco/core/cycle_timer.cc + src/draco/core/cycle_timer.h + src/draco/core/data_buffer.cc + src/draco/core/data_buffer.h + src/draco/core/divide.cc + src/draco/core/divide.h + src/draco/core/draco_index_type.h + src/draco/core/draco_index_type_vector.h + src/draco/core/draco_types.cc + src/draco/core/draco_types.h + src/draco/core/encoder_buffer.cc + src/draco/core/encoder_buffer.h + src/draco/core/hash_utils.cc + src/draco/core/hash_utils.h + src/draco/core/macros.h + src/draco/core/math_utils.h + src/draco/core/options.cc + src/draco/core/options.h + src/draco/core/quantization_utils.cc + src/draco/core/quantization_utils.h + src/draco/core/status.h + src/draco/core/statusor.h + src/draco/core/varint_encoding.h + src/draco/core/vector_d.h + src/draco/mesh/corner_table.cc + src/draco/mesh/corner_table.h + src/draco/mesh/corner_table_iterators.h + src/draco/mesh/mesh_are_equivalent.cc + src/draco/mesh/mesh_are_equivalent.h + src/draco/mesh/mesh_attribute_corner_table.cc + src/draco/mesh/mesh_attribute_corner_table.h + src/draco/mesh/mesh.cc + src/draco/mesh/mesh_cleanup.cc + src/draco/mesh/mesh_cleanup.h + src/draco/mesh/mesh.h + src/draco/mesh/mesh_misc_functions.cc + src/draco/mesh/mesh_misc_functions.h + src/draco/mesh/mesh_stripifier.cc + src/draco/mesh/mesh_stripifier.h + src/draco/mesh/triangle_soup_mesh_builder.cc + src/draco/mesh/triangle_soup_mesh_builder.h + src/draco/mesh/valence_cache.h + src/draco/metadata/geometry_metadata.cc + src/draco/metadata/geometry_metadata.h + src/draco/metadata/metadata.cc + src/draco/metadata/metadata_encoder.cc + src/draco/metadata/metadata_encoder.h + src/draco/metadata/metadata.h + src/draco/point_cloud/point_cloud_builder.cc + src/draco/point_cloud/point_cloud_builder.h + src/draco/point_cloud/point_cloud.cc + src/draco/point_cloud/point_cloud.h ) set(LIB ) set(INC - src + src ) blender_add_lib(dracoenc "${SRC}" "${INC}" "" "${LIB}") diff --git a/extern/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt index 13c3a2a03a9..9179ad7fed0 100644 --- a/extern/gflags/CMakeLists.txt +++ b/extern/gflags/CMakeLists.txt @@ -19,35 +19,35 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - src - src/gflags + src + src/gflags ) set(INC_SYS ) set(SRC - src/gflags.cc - src/gflags_completions.cc - src/gflags_reporting.cc - - src/gflags/config.h - src/gflags/gflags_completions.h - src/gflags/gflags_declare.h - src/gflags/gflags_gflags.h - src/gflags/gflags.h - src/mutex.h - src/util.h + src/gflags.cc + src/gflags_completions.cc + src/gflags_reporting.cc + + src/gflags/config.h + src/gflags/gflags_completions.h + src/gflags/gflags_declare.h + src/gflags/gflags_gflags.h + src/gflags/gflags.h + src/mutex.h + src/util.h ) set(LIB ) if(WIN32) - list(APPEND SRC - src/windows_port.cc - src/windows_port.h - ) + list(APPEND SRC + src/windows_port.cc + src/windows_port.h + ) endif() add_definitions(${GFLAGS_DEFINES}) diff --git a/extern/glew-es/CMakeLists.txt b/extern/glew-es/CMakeLists.txt index 5bb46d3f653..deb73b30455 100644 --- a/extern/glew-es/CMakeLists.txt +++ b/extern/glew-es/CMakeLists.txt @@ -19,7 +19,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - include + include ) set(INC_SYS @@ -27,19 +27,19 @@ set(INC_SYS ) if(UNIX) - list(APPEND INC_SYS - ${X11_X11_INCLUDE_PATH} - ) + list(APPEND INC_SYS + ${X11_X11_INCLUDE_PATH} + ) endif() set(SRC - src/glew.c + src/glew.c - include/GL/eglew.h - include/GL/glesew.h - include/GL/glew.h - include/GL/glxew.h - include/GL/wglew.h + include/GL/eglew.h + include/GL/glesew.h + include/GL/glew.h + include/GL/glxew.h + include/GL/wglew.h ) set(LIB diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index b84b0a30199..e0773d828ec 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -19,7 +19,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - include + include ) set(INC_SYS @@ -27,18 +27,18 @@ set(INC_SYS ) if(UNIX) - list(APPEND INC_SYS - ${X11_X11_INCLUDE_PATH} - ) + list(APPEND INC_SYS + ${X11_X11_INCLUDE_PATH} + ) endif() set(SRC - src/glew.c + src/glew.c - include/GL/eglew.h - include/GL/glew.h - include/GL/glxew.h - include/GL/wglew.h + include/GL/eglew.h + include/GL/glew.h + include/GL/glxew.h + include/GL/wglew.h ) set(LIB diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 05a6590ea81..c60e30d0b48 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -19,81 +19,81 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - src - ../gflags/src + src + ../gflags/src ) set(INC_SYS ) set(SRC - src/logging.cc - src/raw_logging.cc - src/utilities.cc - src/vlog_is_on.cc - - src/utilities.h - - src/config.h - src/config_freebsd.h - src/config_haiku.h - src/config_hurd.h - src/config_linux.h - src/config_mac.h - - src/base/commandlineflags.h - src/base/googleinit.h - src/base/mutex.h - - src/stacktrace.h - src/stacktrace_generic-inl.h - src/stacktrace_libunwind-inl.h - src/stacktrace_powerpc-inl.h - src/stacktrace_x86_64-inl.h - src/stacktrace_x86-inl.h + src/logging.cc + src/raw_logging.cc + src/utilities.cc + src/vlog_is_on.cc + + src/utilities.h + + src/config.h + src/config_freebsd.h + src/config_haiku.h + src/config_hurd.h + src/config_linux.h + src/config_mac.h + + src/base/commandlineflags.h + src/base/googleinit.h + src/base/mutex.h + + src/stacktrace.h + src/stacktrace_generic-inl.h + src/stacktrace_libunwind-inl.h + src/stacktrace_powerpc-inl.h + src/stacktrace_x86_64-inl.h + src/stacktrace_x86-inl.h ) set(LIB ) if(NOT WITH_SYSTEM_GFLAGS) - list(APPEND LIB - extern_gflags - ) + list(APPEND LIB + extern_gflags + ) endif() if(WIN32) - list(APPEND SRC - src/windows/port.cc - - src/windows/glog/raw_logging.h - src/windows/glog/vlog_is_on.h - src/windows/glog/logging.h - src/windows/glog/log_severity.h - src/windows/port.h - src/windows/config.h - ) - - list(APPEND INC - src/windows - ) + list(APPEND SRC + src/windows/port.cc + + src/windows/glog/raw_logging.h + src/windows/glog/vlog_is_on.h + src/windows/glog/logging.h + src/windows/glog/log_severity.h + src/windows/port.h + src/windows/config.h + ) + + list(APPEND INC + src/windows + ) else() - list(APPEND INC - include - ) - list(APPEND SRC - src/demangle.cc - src/signalhandler.cc - src/symbolize.cc - - src/demangle.h - src/symbolize.h - - include/glog/logging.h - include/glog/log_severity.h - include/glog/raw_logging.h - include/glog/vlog_is_on.h - ) + list(APPEND INC + include + ) + list(APPEND SRC + src/demangle.cc + src/signalhandler.cc + src/symbolize.cc + + src/demangle.h + src/symbolize.h + + include/glog/logging.h + include/glog/log_severity.h + include/glog/raw_logging.h + include/glog/vlog_is_on.h + ) endif() add_definitions(${GFLAGS_DEFINES}) diff --git a/extern/gtest/CMakeLists.txt b/extern/gtest/CMakeLists.txt index f33e012b0f4..056b32cc99e 100644 --- a/extern/gtest/CMakeLists.txt +++ b/extern/gtest/CMakeLists.txt @@ -20,14 +20,14 @@ # avoid noisy warnings if(CMAKE_COMPILER_IS_GNUCC) - remove_cc_flag( - "-Wmissing-declarations" - ) + remove_cc_flag( + "-Wmissing-declarations" + ) endif() set(INC - . - include + . + include ) set(INC_SYS @@ -35,35 +35,35 @@ set(INC_SYS ) set(SRC - src/gtest.cc - src/gtest-death-test.cc - src/gtest-filepath.cc - src/gtest-port.cc - src/gtest-printers.cc - src/gtest-test-part.cc - src/gtest-typed-test.cc + src/gtest.cc + src/gtest-death-test.cc + src/gtest-filepath.cc + src/gtest-port.cc + src/gtest-printers.cc + src/gtest-test-part.cc + src/gtest-typed-test.cc - src/gtest-internal-inl.h - include/gtest/gtest-death-test.h - include/gtest/gtest.h - include/gtest/gtest-message.h - include/gtest/gtest-param-test.h - include/gtest/gtest_pred_impl.h - include/gtest/gtest-printers.h - include/gtest/gtest_prod.h - include/gtest/gtest-spi.h - include/gtest/gtest-test-part.h - include/gtest/gtest-typed-test.h - include/gtest/internal/gtest-death-test-internal.h - include/gtest/internal/gtest-filepath.h - include/gtest/internal/gtest-internal.h - include/gtest/internal/gtest-linked_ptr.h - include/gtest/internal/gtest-param-util-generated.h - include/gtest/internal/gtest-param-util.h - include/gtest/internal/gtest-port.h - include/gtest/internal/gtest-string.h - include/gtest/internal/gtest-tuple.h - include/gtest/internal/gtest-type-util.h + src/gtest-internal-inl.h + include/gtest/gtest-death-test.h + include/gtest/gtest.h + include/gtest/gtest-message.h + include/gtest/gtest-param-test.h + include/gtest/gtest_pred_impl.h + include/gtest/gtest-printers.h + include/gtest/gtest_prod.h + include/gtest/gtest-spi.h + include/gtest/gtest-test-part.h + include/gtest/gtest-typed-test.h + include/gtest/internal/gtest-death-test-internal.h + include/gtest/internal/gtest-filepath.h + include/gtest/internal/gtest-internal.h + include/gtest/internal/gtest-linked_ptr.h + include/gtest/internal/gtest-param-util-generated.h + include/gtest/internal/gtest-param-util.h + include/gtest/internal/gtest-port.h + include/gtest/internal/gtest-string.h + include/gtest/internal/gtest-tuple.h + include/gtest/internal/gtest-type-util.h ) set(LIB diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index 8be848f83ce..8bdddf0aced 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -19,7 +19,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . + . ) set(INC_SYS @@ -27,19 +27,19 @@ set(INC_SYS ) set(SRC - Alloc.c - LzFind.c - LzmaDec.c - LzmaEnc.c - LzmaLib.c + Alloc.c + LzFind.c + LzmaDec.c + LzmaEnc.c + LzmaLib.c - Alloc.h - LzFind.h - LzHash.h - LzmaDec.h - LzmaEnc.h - LzmaLib.h - Types.h + Alloc.h + LzFind.h + LzHash.h + LzmaDec.h + LzmaEnc.h + LzmaLib.h + Types.h ) set(LIB diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index 7eebc92c46d..630918dc92c 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -29,11 +29,11 @@ set(INC_SYS ) set(SRC - minilzo/minilzo.c + minilzo/minilzo.c - minilzo/lzoconf.h - minilzo/lzodefs.h - minilzo/minilzo.h + minilzo/lzoconf.h + minilzo/lzodefs.h + minilzo/minilzo.h ) set(LIB diff --git a/extern/rangetree/CMakeLists.txt b/extern/rangetree/CMakeLists.txt index cb0b424a023..b5c209d5aa3 100644 --- a/extern/rangetree/CMakeLists.txt +++ b/extern/rangetree/CMakeLists.txt @@ -17,14 +17,14 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . + . ) set(SRC - range_tree.h - intern/generic_alloc_impl.h + range_tree.h + intern/generic_alloc_impl.h - intern/range_tree.c + intern/range_tree.c ) set(LIB diff --git a/extern/sdlew/CMakeLists.txt b/extern/sdlew/CMakeLists.txt index 5698d87108b..29bae5e4782 100644 --- a/extern/sdlew/CMakeLists.txt +++ b/extern/sdlew/CMakeLists.txt @@ -19,8 +19,8 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . - include + . + include ) set(INC_SYS @@ -28,8 +28,8 @@ set(INC_SYS ) set(SRC - include/sdlew.h - src/sdlew.c + include/sdlew.h + src/sdlew.c ) set(LIB diff --git a/extern/wcwidth/CMakeLists.txt b/extern/wcwidth/CMakeLists.txt index 384a2c4f58c..805655de26a 100644 --- a/extern/wcwidth/CMakeLists.txt +++ b/extern/wcwidth/CMakeLists.txt @@ -19,7 +19,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . + . ) set(INC_SYS @@ -27,9 +27,9 @@ set(INC_SYS ) set(SRC - wcwidth.c + wcwidth.c - wcwidth.h + wcwidth.h ) set(LIB diff --git a/extern/xdnd/CMakeLists.txt b/extern/xdnd/CMakeLists.txt index 54d6648c2a6..3da6f728620 100644 --- a/extern/xdnd/CMakeLists.txt +++ b/extern/xdnd/CMakeLists.txt @@ -19,23 +19,23 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . + . ) set(INC_SYS - ${X11_X11_INCLUDE_PATH} + ${X11_X11_INCLUDE_PATH} ) set(SRC - xdnd.c - xdnd.h + xdnd.c + xdnd.h ) set(LIB ) add_definitions( - -DHAVE_SYS_TIME_H + -DHAVE_SYS_TIME_H ) blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |