[Bf-blender-cvs] [986267300ba] blender2.8: Audaspace: Moving audaspace 1.3 into extern.

Jörg Müller noreply at git.blender.org
Fri Aug 18 08:50:52 CEST 2017 

Commit: 986267300ba42a5c99d2802cd701803dd558e389
Author: Jörg Müller
Date:   Fri Aug 18 08:24:12 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB986267300ba42a5c99d2802cd701803dd558e389

Audaspace: Moving audaspace 1.3 into extern.

Deleting the old internal audaspace.

Major changes from there are:
- The whole library was refactored to use C++11.
- Many stability and performance improvements.
- Major Python API refactor:
 - Most requested: Play self generated sounds using numpy arrays.
 - For games: Sound list, random sounds and dynamic music.
 - Writing sounds to files.
 - Sequencing API.
 - Opening sound devices, eg. Jack.
- Ability to choose different OpenAL devices in the user settings.

===================================================================

M	CMakeLists.txt
M	build_files/build_environment/cmake/sndfile.cmake
M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/install_deps.sh
M	build_files/buildbot/config/blender_linux.cmake
M	build_files/cmake/Modules/FindSndFile.cmake
M	build_files/cmake/macros.cmake
M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_unix.cmake
M	build_files/cmake/platform/platform_win32.cmake
M	extern/CMakeLists.txt
A	extern/audaspace/AUTHORS
A	extern/audaspace/CHANGES
A	extern/audaspace/CMakeLists.txt
A	extern/audaspace/INSTALL
A	extern/audaspace/LICENSE
A	extern/audaspace/README.md
A	extern/audaspace/bindings/C/AUD_Device.cpp
A	extern/audaspace/bindings/C/AUD_Device.h
A	extern/audaspace/bindings/C/AUD_DynamicMusic.cpp
A	extern/audaspace/bindings/C/AUD_DynamicMusic.h
A	extern/audaspace/bindings/C/AUD_HRTF.cpp
A	extern/audaspace/bindings/C/AUD_HRTF.h
A	extern/audaspace/bindings/C/AUD_Handle.cpp
A	extern/audaspace/bindings/C/AUD_Handle.h
A	extern/audaspace/bindings/C/AUD_ImpulseResponse.cpp
A	extern/audaspace/bindings/C/AUD_ImpulseResponse.h
A	extern/audaspace/bindings/C/AUD_PlaybackManager.cpp
A	extern/audaspace/bindings/C/AUD_PlaybackManager.h
A	extern/audaspace/bindings/C/AUD_Sequence.cpp
A	extern/audaspace/bindings/C/AUD_Sequence.h
A	extern/audaspace/bindings/C/AUD_Sound.cpp
A	extern/audaspace/bindings/C/AUD_Sound.h
A	extern/audaspace/bindings/C/AUD_Source.cpp
A	extern/audaspace/bindings/C/AUD_Source.h
A	extern/audaspace/bindings/C/AUD_Special.cpp
A	extern/audaspace/bindings/C/AUD_Special.h
A	extern/audaspace/bindings/C/AUD_ThreadPool.cpp
A	extern/audaspace/bindings/C/AUD_ThreadPool.h
A	extern/audaspace/bindings/C/AUD_Types.h
A	extern/audaspace/bindings/doc/conf.py.in
A	extern/audaspace/bindings/doc/device.rst
A	extern/audaspace/bindings/doc/handle.rst
A	extern/audaspace/bindings/doc/index.rst
A	extern/audaspace/bindings/doc/sequence.rst
A	extern/audaspace/bindings/doc/sequence_entry.rst
A	extern/audaspace/bindings/doc/sound.rst
A	extern/audaspace/bindings/doc/tutorials.rst
A	extern/audaspace/bindings/python/PyAPI.cpp
A	extern/audaspace/bindings/python/PyAPI.h
A	extern/audaspace/bindings/python/PyDevice.cpp
A	extern/audaspace/bindings/python/PyDevice.h
A	extern/audaspace/bindings/python/PyDynamicMusic.cpp
A	extern/audaspace/bindings/python/PyDynamicMusic.h
A	extern/audaspace/bindings/python/PyHRTF.cpp
A	extern/audaspace/bindings/python/PyHRTF.h
A	extern/audaspace/bindings/python/PyHandle.cpp
A	extern/audaspace/bindings/python/PyHandle.h
A	extern/audaspace/bindings/python/PyImpulseResponse.cpp
A	extern/audaspace/bindings/python/PyImpulseResponse.h
A	extern/audaspace/bindings/python/PyPlaybackManager.cpp
A	extern/audaspace/bindings/python/PyPlaybackManager.h
A	extern/audaspace/bindings/python/PySequence.cpp
A	extern/audaspace/bindings/python/PySequence.h
A	extern/audaspace/bindings/python/PySequenceEntry.cpp
A	extern/audaspace/bindings/python/PySequenceEntry.h
A	extern/audaspace/bindings/python/PySound.cpp
A	extern/audaspace/bindings/python/PySound.h
A	extern/audaspace/bindings/python/PySource.cpp
A	extern/audaspace/bindings/python/PySource.h
A	extern/audaspace/bindings/python/PyThreadPool.cpp
A	extern/audaspace/bindings/python/PyThreadPool.h
A	extern/audaspace/bindings/python/examples/binaural.py
A	extern/audaspace/bindings/python/examples/convolution.py
A	extern/audaspace/bindings/python/examples/dynamicmusic.py
A	extern/audaspace/bindings/python/examples/playbackmanager.py
A	extern/audaspace/bindings/python/examples/player.py
A	extern/audaspace/bindings/python/examples/randomSounds.py
A	extern/audaspace/bindings/python/examples/simple.py
A	extern/audaspace/bindings/python/examples/siren.py
A	extern/audaspace/bindings/python/examples/siren2.py
A	extern/audaspace/bindings/python/examples/tetris.py
A	extern/audaspace/bindings/python/examples/tetris2.py
A	extern/audaspace/bindings/python/examples/tetris3.py
A	extern/audaspace/bindings/python/setup.py.in
A	extern/audaspace/blender_config.cmake
A	extern/audaspace/config/Audaspace.h.in
A	extern/audaspace/include/Exception.h
R063	intern/audaspace/intern/AUD_IReader.h	extern/audaspace/include/IReader.h
A	extern/audaspace/include/ISound.h
A	extern/audaspace/include/devices/DefaultSynchronizer.h
A	extern/audaspace/include/devices/DeviceManager.h
A	extern/audaspace/include/devices/I3DDevice.h
R055	intern/audaspace/intern/AUD_I3DHandle.h	extern/audaspace/include/devices/I3DHandle.h
A	extern/audaspace/include/devices/IDevice.h
A	extern/audaspace/include/devices/IDeviceFactory.h
R065	intern/audaspace/intern/AUD_IHandle.h	extern/audaspace/include/devices/IHandle.h
A	extern/audaspace/include/devices/ISynchronizer.h
A	extern/audaspace/include/devices/NULLDevice.h
A	extern/audaspace/include/devices/ReadDevice.h
R055	intern/audaspace/intern/AUD_SoftwareDevice.h	extern/audaspace/include/devices/SoftwareDevice.h
A	extern/audaspace/include/file/File.h
A	extern/audaspace/include/file/FileManager.h
A	extern/audaspace/include/file/FileWriter.h
A	extern/audaspace/include/file/IFileInput.h
A	extern/audaspace/include/file/IFileOutput.h
A	extern/audaspace/include/file/IWriter.h
A	extern/audaspace/include/fx/ADSR.h
A	extern/audaspace/include/fx/ADSRReader.h
A	extern/audaspace/include/fx/Accumulator.h
R051	intern/audaspace/FX/AUD_BaseIIRFilterReader.h	extern/audaspace/include/fx/BaseIIRFilterReader.h
A	extern/audaspace/include/fx/BinauralReader.h
A	extern/audaspace/include/fx/BinauralSound.h
A	extern/audaspace/include/fx/Butterworth.h
A	extern/audaspace/include/fx/ButterworthCalculator.h
A	extern/audaspace/include/fx/CallbackIIRFilterReader.h
A	extern/audaspace/include/fx/Convolver.h
A	extern/audaspace/include/fx/ConvolverReader.h
A	extern/audaspace/include/fx/ConvolverSound.h
A	extern/audaspace/include/fx/Delay.h
A	extern/audaspace/include/fx/DelayReader.h
A	extern/audaspace/include/fx/DynamicIIRFilter.h
A	extern/audaspace/include/fx/DynamicIIRFilterReader.h
A	extern/audaspace/include/fx/DynamicMusic.h
A	extern/audaspace/include/fx/Effect.h
A	extern/audaspace/include/fx/EffectReader.h
A	extern/audaspace/include/fx/Envelope.h
A	extern/audaspace/include/fx/FFTConvolver.h
A	extern/audaspace/include/fx/Fader.h
A	extern/audaspace/include/fx/FaderReader.h
A	extern/audaspace/include/fx/HRTF.h
A	extern/audaspace/include/fx/HRTFLoader.h
A	extern/audaspace/include/fx/Highpass.h
A	extern/audaspace/include/fx/HighpassCalculator.h
A	extern/audaspace/include/fx/IDynamicIIRFilterCalculator.h
A	extern/audaspace/include/fx/IIRFilter.h
A	extern/audaspace/include/fx/IIRFilterReader.h
A	extern/audaspace/include/fx/ImpulseResponse.h
A	extern/audaspace/include/fx/Limiter.h
A	extern/audaspace/include/fx/LimiterReader.h
A	extern/audaspace/include/fx/Loop.h
A	extern/audaspace/include/fx/LoopReader.h
A	extern/audaspace/include/fx/Lowpass.h
A	extern/audaspace/include/fx/LowpassCalculator.h
A	extern/audaspace/include/fx/MutableReader.h
A	extern/audaspace/include/fx/MutableSound.h
A	extern/audaspace/include/fx/Pitch.h
A	extern/audaspace/include/fx/PitchReader.h
A	extern/audaspace/include/fx/PlaybackCategory.h
A	extern/audaspace/include/fx/PlaybackManager.h
A	extern/audaspace/include/fx/Reverse.h
A	extern/audaspace/include/fx/ReverseReader.h
A	extern/audaspace/include/fx/SoundList.h
A	extern/audaspace/include/fx/Source.h
A	extern/audaspace/include/fx/Sum.h
A	extern/audaspace/include/fx/Threshold.h
A	extern/audaspace/include/fx/Volume.h
A	extern/audaspace/include/fx/VolumeReader.h
A	extern/audaspace/include/fx/VolumeSound.h
A	extern/audaspace/include/fx/VolumeStorage.h
A	extern/audaspace/include/generator/Sawtooth.h
A	extern/audaspace/include/generator/SawtoothReader.h
A	extern/audaspace/include/generator/Silence.h
A	extern/audaspace/include/generator/SilenceReader.h
A	extern/audaspace/include/generator/Sine.h
A	extern/audaspace/include/generator/SineReader.h
A	extern/audaspace/include/generator/Square.h
A	extern/audaspace/include/generator/SquareReader.h
A	extern/audaspace/include/generator/Triangle.h
A	extern/audaspace/include/generator/TriangleReader.h
A	extern/audaspace/include/plugin/PluginManager.h
A	extern/audaspace/include/respec/ChannelMapper.h
A	extern/audaspace/include/respec/ChannelMapperReader.h
A	extern/audaspace/include/respec/Converter.h
A	extern/audaspace/include/respec/ConverterFunctions.h
A	extern/audaspace/include/respec/ConverterReader.h
A	extern/audaspace/include/respec/JOSResample.h
A	extern/audaspace/include/respec/JOSResampleReader.h
A	extern/audaspace/include/respec/LinearResample.h
A	extern/audaspace/include/respec/LinearResampleReader.h
A	extern/audaspace/include/respec/Mixer.h
A	extern/audaspace/include/respec/ResampleReader.h
A	extern/audaspace/include/respec/Specification.h
A	extern/audaspace/include/respec/SpecsChanger.h
A	extern/audaspace/include/sequence/AnimateableProperty.h
A	extern/audaspace/include/sequence/Double.h
A	extern/audaspace/include/sequence/DoubleReader.h
A	extern/audaspace/include/sequence/PingPong.h
R050	intern/audaspace/intern/AUD_SequencerFactory.h	extern/audaspace/include/sequence/Sequence.h
R058	intern/audaspace/intern/AUD_Sequencer.h	extern/audaspace/include/sequence/SequenceData.h
R069	intern/audaspace/intern/AUD_SequencerEntry.h	extern/audaspace/include/sequence/SequenceEntry.h
A	extern/audaspace/include/sequence/SequenceReader.h
A	extern/audaspace/include/sequence/Superpose.h
A	extern/audaspace/include/sequence/SuperposeReader.h
A	extern/audaspace/include/util/Barrier.h
A	extern/audaspace/include/util/Buffer.h
A	extern/audaspace/include/util/BufferReader.h
A	extern/audaspace/include/util/FFTPlan.h
A	extern/audaspace/include/util/ILockable.h
R064	intern/audaspace/intern/AUD_3DMath.h	extern/audaspace/include/util/Math3D.h
A	extern/audaspace/include/util/StreamBuffer.h
A	extern/audaspace/include/util/ThreadPool.h
A	extern/audaspace/plugins/ffmpeg/FFMPEG.cpp
A	extern/audaspace/plugins/ffmpeg/FFMPEG.h
A	extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
A	extern/audaspace/plugins/ffmpeg/FFMPEGReader.h
A	extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
A	extern/audaspace/plugins/ffmpeg/FFMPEGWriter.h
A	extern/audaspace/plugins/jack/JackDevice.cpp
R050	intern/audaspace/jack/AUD_JackDevice.h	extern/audaspace/plugins/jack/JackDevice.h
A	extern/audaspace/plugins/jack/JackLibrary.cpp
A	extern/audaspace/plugins/jack/JackLibrary.h
A	extern/audaspace/plugins/jack/JackSymbols.h
A	extern/audaspace/plugins/jack/JackSynchronizer.cpp
A	extern/audaspace/plugins/jack/JackSynchronizer.h
A	extern/audaspace/plugins/libsndfile/SndFile.cpp
A	extern/audaspace/plugins/libsndfile/SndFile.h
A	extern/audaspace/plugins/libsndfile/SndFileReader.cpp
A	extern/audaspace/plugins/libsndfile/SndFileReader.h
A	extern/audaspace/plugins/libsndfile/SndFileWriter.cpp
A	extern/audaspace/plugins/libsndfile/SndFileWriter.h
A	extern/audaspace/plugins/openal/OpenALDevice.cpp
R051	intern/audaspace/OpenAL/AUD_OpenALDevice.h	extern/audaspace/plugins/openal/OpenALDevice.h
A	extern/audaspace/plugins/openal/OpenALReader.cpp
A	extern/audaspace/plugins/openal/OpenALReader.h
A	extern/audaspace/plugins/sdl/SDLDevice.cpp
A	extern/audaspace/plugins/sdl/SDLDevice.h
A	extern/audaspace/src/Exception.cpp
A	extern/audaspace/src/devices/DefaultSynchronizer.cpp
A	extern/audaspace/src/devices/DeviceManager.cpp
A	extern/audaspace/src/devices/NULLDevice.cpp
A	extern/audaspace/src/devices/ReadDevice.cpp
A	extern/audaspace/src/devices/SoftwareDevice.cpp
A	extern/audaspace/src/file/File.cpp
A	extern/audaspace/src/file/FileManager.cpp
A	extern/audaspace/src/file/FileWriter.cpp
A	extern/audaspace/src/fx/ADSR.cpp
A	extern/audaspace/src/fx/ADSRReader.cpp
A	extern/audaspace/src/fx/Accumulator.cpp
A	extern/audaspace/src/fx/BaseIIRFilterReader.cpp
A	extern/audaspace/src/fx/BinauralReader.cpp
A	extern/audaspace/src/fx/BinauralSound.cpp
A	extern/audaspace/src/fx/Butterworth.cpp
A	extern/audaspace/src/fx/ButterworthCalculator.cpp
A	extern/audaspace/src/fx/CallbackIIRFilterReader.cpp
A	extern/audaspace/src/fx/Convolver.cpp
A	extern/audaspace/src/fx/ConvolverReader.cpp
A	extern/audaspace/src/fx/ConvolverSound.cpp
A	extern/audaspace/src/fx/Delay.cpp
A	extern/audaspace/src/fx/DelayReader.cpp
A	extern/audaspace/src/fx/DynamicIIRFilter.cpp
A	extern/audaspace/src/fx/DynamicIIRFilterReader.cpp
A	extern/audaspace/src/fx/DynamicMusic.cpp
A	extern/audaspace/src/fx/Effect.cpp
A	extern/audaspace/src/fx/EffectReader.cpp
A	extern/audaspace/src/fx/Envelope.cpp
A	extern/audaspace/src/fx/FFTConvolver.cpp
A	extern/audaspace/src/fx/Fader.cpp
A	extern/audaspace/src/fx/FaderReader.cpp
A	extern/audaspace/src/fx/HRTF.cpp
A	extern/audaspace/src/fx/HRTFLoaderUnix.cpp
A	extern/audaspace/src/fx/HRTFLoaderWindows.cpp
A	extern/audaspace/src/fx/Highpass.cpp
A	extern/audaspace/src/fx/HighpassCalculator.cpp
A	extern/audaspace/src/fx/IIRFilter.cpp
A	extern/audaspace/src/fx/IIRFilterReader.cpp
A	extern/audaspace/src/fx/ImpulseResponse.cpp
A	extern/audaspace/src/fx/Limiter.cpp
R050	intern/audaspace/FX/AUD_LimiterReader.cpp	extern/audaspace/src/fx/LimiterReader.cpp
A	extern/audaspace/src/fx/Loop.cpp
A	extern/audaspace/src/fx/LoopReader.cpp
A	extern/audaspace/src/fx/Lowpass.cpp
A	extern/audaspace/src/fx/LowpassCalculator.cpp
A	extern/audaspace/src/fx/MutableReader.cpp
A	extern/audaspace/src/fx/MutableSound.cpp
A	extern/audaspace/src/fx/Pitch.cpp
A	extern/audaspace/src/fx/PitchReader.cpp
A	extern/audaspace/src/fx/PlaybackCategory.cpp
A	extern/audaspace/src/fx/PlaybackManager.cpp
A	extern/audaspace/src/fx/Reverse.cpp
A	extern/audaspace/src/fx/ReverseReader.cpp
A	extern/audaspace/src/fx/SoundList.cpp
A	extern/audaspace/src/fx/Source.cpp
A	extern/audaspace/src/fx/Sum.cpp
A	extern/audaspace/src/fx/Threshold.cpp
A	extern/audaspace/src/fx/Volume.cpp
A	extern/audaspace/src/fx/VolumeReader.cpp
A	extern/audaspace/src/fx/VolumeSound.cpp
A	extern/audaspace/src/fx/VolumeStorage.cpp
A	extern/audaspace/src/generator/Sawtooth.cpp
A	extern/audaspace/src/generator/SawtoothReader.cpp
A	extern/audaspace/src/generator/Silence.cpp
A	extern/audaspace/src/generator/SilenceReader.cpp
A	extern/audaspace/src/generator/Sine.cpp
A	extern/audaspace/src/generator/SineReader.cpp
A	extern/audaspace/src/generator/Square.cpp
A	extern/audaspace/src/generator/SquareReader.cpp
A	extern/audaspace/src/generator/Triangle.cpp
A	extern/audaspace/src/generator/TriangleReader.cpp
A	extern/audaspace/src/plugin/PluginManagerUnix.cpp.in
A	extern/audaspace/src/plugin/PluginManagerWindows.cpp.in
A	extern/audaspace/src/respec/ChannelMapper.cpp
A	extern/audaspace/src/respec/ChannelMapperReader.cpp
A	extern/audaspace/src/respec/Converter.cpp
A	extern/audaspace/src/respec/ConverterFunctions.cpp
A	extern/audaspace/src/respec/ConverterReader.cpp
A	extern/audaspace/src/respec/JOSResample.cpp
R059	intern/audaspace/intern/AUD_JOSResampleReader.cpp	extern/audaspace/src/respec/JOSResampleReader.cpp
R099	intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp	extern/audaspace/src/respec/JOSResampleReaderCoeff.cpp
A	extern/audaspace/src/respec/LinearResample.cpp
A	extern/audaspace/src/respec/LinearResampleReader.cpp
A	extern/audaspace/src/respec/Mixer.cpp
A	extern/audaspace/src/respec/ResampleReader.cpp
A	extern/audaspace/src/respec/SpecsChanger.cpp
A	extern/audaspace/src/sequence/AnimateableProperty.cpp
A	extern/audaspace/src/sequence/Double.cpp
A	extern/audaspace/src/sequence/DoubleReader.cpp
A	extern/audaspace/src/sequence/PingPong.cpp
A	extern/audaspace/src/sequence/Sequence.cpp
A	extern/audaspace/src/sequence/SequenceData.cpp
A	extern/audaspace/src/sequence/SequenceEntry.cpp
R065	intern/audaspace/intern/AUD_SequencerHandle.cpp	extern/audaspace/src/sequence/SequenceHandle.cpp
R051	intern/audaspace/intern/AUD_SequencerHandle.h	extern/audaspace/src/sequence/SequenceHandle.h
A	extern/audaspace/src/sequence/SequenceReader.cpp
A	extern/audaspace/src/sequence/Superpose.cpp
A	extern/audaspace/src/sequence/SuperposeReader.cpp
A	extern/audaspace/src/util/Barrier.cpp
A	extern/audaspace/src/util/Buffer.cpp
A	extern/audaspace/src/util/BufferReader.cpp
A	extern/audaspace/src/util/FFTPlan.cpp
A	extern/audaspace/src/util/StreamBuffer.cpp
A	extern/audaspace/src/util/ThreadPool.cpp
M	intern/audaspace/CMakeLists.txt
D	intern/audaspace/COPYING
D	intern/audaspace/FX/AUD_AccumulatorFactory.cpp
D	intern/audaspace/FX/AUD_AccumulatorFactory.h
D	intern/audaspace/FX/AUD_BandpassCalculator.cpp
D	intern/audaspace/FX/AUD_BandpassCalculator.h
D	intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
D	intern/audaspace/FX/AUD_ButterworthCalculator.cpp
D	intern/audaspace/FX/AUD_ButterworthCalculator.h
D	intern/audaspace/FX/AUD_ButterworthFactory.cpp
D	intern/audaspace/FX/AUD_ButterworthFactory.h
D	intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
D	intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
D	intern/audaspace/FX/AUD_DelayFactory.cpp
D	intern/audaspace/FX/AUD_DelayFactory.h
D	intern/audaspace/FX/AUD_DelayReader.cpp
D	intern/audaspace/FX/AUD_DelayReader.h
D	intern/audaspace/FX/AUD_DoubleFactory.cpp
D	intern/audaspace/FX/AUD_DoubleFactory.h
D	intern/audaspace/FX/AUD_DoubleReader.cpp
D	intern/audaspace/FX/AUD_DoubleReader.h
D	intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
D	intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
D	intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
D	intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
D	intern/audaspace/FX/AUD_EffectFactory.cpp
D	intern/audaspace/FX/AUD_EffectFactory.h
D	intern/audaspace/FX/AUD_EffectReader.cpp
D	intern/audaspace/FX/AUD_EffectReader.h
D	intern/audaspace/FX/AUD_EnvelopeFactory.cpp
D	intern/audaspace/FX/AUD_EnvelopeFactory.h
D	intern/audaspace/FX/AUD_FaderFactory.cpp
D	intern/audaspace/FX/AUD_FaderFactory.h
D	intern/audaspace/FX/AUD_FaderReader.cpp
D	intern/audaspace/FX/AUD_FaderReader.h
D	intern/audaspace/FX/AUD_HighpassCalculator.cpp
D	intern/audaspace/FX/AUD_HighpassCalculator.h
D	intern/audaspace/FX/AUD_HighpassFactory.cpp
D	intern/audaspace/FX/AUD_HighpassFactory.h
D	intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
D	intern/audaspace/FX/AUD_IIRFilterFactory.cpp
D	intern/audaspace/FX/AUD_IIRFilterFactory.h
D	intern/audaspace/FX/AUD_IIRFilterReader.cpp
D	intern/audaspace/FX/AUD_IIRFilterReader.h
D	intern/audaspace/FX/AUD_LimiterFactory.cpp
D	intern/audaspace/FX/AUD_LimiterFactory.h
D	intern/audaspace/FX/AUD_LimiterReader.h
D	intern/audaspace/FX/AUD_LoopFactory.cpp
D	intern/audaspace/FX/AUD_LoopFactory.h
D	intern/audaspace/FX/AUD_LoopReader.cpp
D	intern/audaspace/FX/AUD_LoopReader.h
D	intern/audaspace/FX/AUD_LowpassCalculator.cpp
D	intern/audaspace/FX/AUD_LowpassCalculator.h
D	intern/audaspace/FX/AUD_LowpassFactory.cpp
D	intern/audaspace/FX/AUD_LowpassFactory.h
D	intern/audaspace/FX/AUD_PingPongFactory.cpp
D	intern/audaspace/FX/AUD_PingPongFactory.h
D	intern/audaspace/FX/AUD_PitchFactory.cpp
D	intern/audaspace/FX/AUD_PitchFactory.h
D	intern/audaspace/FX/AUD_PitchReader.cpp
D	intern/audaspace/FX/AUD_PitchReader.h
D	intern/audaspace/FX/AUD_RectifyFactory.cpp
D	intern/audaspace/FX/AUD_RectifyFactory.h
D	intern/audaspace/FX/AUD_ReverseFactory.cpp
D	intern/audaspace/FX/AUD_ReverseFactory.h
D	intern/audaspace/FX/AUD_ReverseReader.cpp
D	intern/audaspace/FX/AUD_ReverseReader.h
D	intern/audaspace/FX/AUD_SquareFactory.cpp
D	intern/audaspace/FX/AUD_SquareFactory.h
D	intern/audaspace/FX/AUD_SumFactory.cpp
D	intern/audaspace/FX/AUD_SumFactory.h
D	intern/audaspace/FX/AUD_SuperposeFactory.cpp
D	intern/audaspace/FX/AUD_SuperposeFactory.h
D	intern/audaspace/FX/AUD_SuperposeReader.cpp
D	intern/audaspace/FX/AUD_SuperposeReader.h
D	intern/audaspace/FX/AUD_VolumeFactory.cpp
D	intern/audaspace/FX/AUD_VolumeFactory.h
D	intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
D	intern/audaspace/Python/AUD_PyAPI.cpp
D	intern/audaspace/Python/AUD_PyAPI.h
D	intern/audaspace/SDL/AUD_SDLDevice.cpp
D	intern/audaspace/SDL/AUD_SDLDevice.h
D	intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
D	intern/audaspace/SRC/AUD_SRCResampleFactory.h
D	intern/audaspace/SRC/AUD_SRCResampleReader.cpp
D	intern/audaspace/SRC/AUD_SRCResampleReader.h
D	intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
D	intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
D	intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
D	intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
D	intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
D	intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
D	intern/audaspace/fftw/AUD_BandPassFactory.cpp
D	intern/audaspace/fftw/AUD_BandPassFactory.h
D	intern/audaspace/fftw/AUD_BandPassReader.cpp
D	intern/audaspace/fftw/AUD_BandPassReader.h
D	intern/audaspace/intern/AUD_AnimateableProperty.cpp
D	intern/audaspace/intern/AUD_AnimateableProperty.h
D	intern/audaspace/intern/AUD_Buffer.cpp
D	intern/audaspace/intern/AUD_Buffer.h
D	intern/audaspace/intern/AUD_BufferReader.cpp
D	intern/audaspace/intern/AUD_BufferReader.h
D	intern/audaspace/intern/AUD_C-API.cpp
D	intern/audaspace/intern/AUD_C-API.h
D	intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
D	intern/audaspace/intern/AUD_ChannelMapperFactory.h
D	intern/audaspace/intern/AUD_ChannelMapperReader.cpp
D	intern/audaspace/intern/AUD_ChannelMapperReader.h
D	intern/audaspace/intern/AUD_ConverterFactory.cpp
D	intern/audaspace/intern/AUD_ConverterFactory.h
D	intern/audaspace/intern/AUD_ConverterFunctions.cpp
D	intern/audaspace/intern/AUD_ConverterFunctions.h
D	intern/audaspace/intern/AUD_ConverterReader.cpp
D	intern/audaspace/intern/AUD_ConverterReader.h
D	intern/audaspace/intern/AUD_FileFactory.cpp
D	intern/audaspace/intern/AUD_FileFactory.h
D	intern/audaspace/intern/AUD_FileWriter.cpp
D	intern/audaspace/intern/AUD_FileWriter.h
D	intern/audaspace/intern/AUD_I3DDevice.h
D	intern/audaspace/intern/AUD_IDevice.h
D	intern/audaspace/intern/AUD_IFactory.h
D	intern/audaspace/intern/AUD_ILockable.h
D	intern/audaspace/intern/AUD_IWriter.h
D	intern/audaspace/intern/AUD_JOSResampleFactory.cpp
D	intern/audaspace/intern/AUD_JOSResampleFactory.h
D	intern/audaspace/intern/AUD_JOSResampleReader.h
D	intern/audaspace/intern/AUD_LinearResampleFactory.cpp
D	intern/audaspace/intern/AUD_LinearResampleFactory.h
D	intern/audaspace/intern/AUD_LinearResampleReader.cpp
D	intern/audaspace/intern/AUD_LinearResampleReader.h
D	intern/audaspace/intern/AUD_Mixer.cpp
D	intern/audaspace/intern/AUD_Mixer.h
D	intern/audaspace/intern/AUD_MixerFactory.cpp
D	intern/audaspace/intern/AUD_MixerFactory.h
D	intern/audaspace/intern/AUD_MutexLock.h
D	intern/audaspace/intern/AUD_NULLDevice.cpp
D	intern/audaspace/intern/AUD_NULLDevice.h
D	intern/audaspace/intern/AUD_ReadDevice.cpp
D	intern/audaspace/intern/AUD_ReadDevice.h
D	intern/audaspace/intern/AUD_ResampleFactory.h
D	intern/audaspace/intern/AUD_ResampleReader.cpp
D	intern/audaspace/intern/AUD_ResampleReader.h
D	intern/audaspace/intern/AUD_Sequencer.cpp
D	intern/audaspace/intern/AUD_SequencerEntry.cpp
D	intern/audaspace/intern/AUD_SequencerFactory.cpp
D	intern/audaspace/intern/AUD_SequencerReader.cpp
D	intern/audaspace/intern/AUD_SequencerReader.h
D	intern/audaspace/intern/AUD_SilenceFactory.cpp
D	intern/audaspace/intern/AUD_SilenceFactory.h
D	intern/audaspace/intern/AUD_SilenceReader.cpp
D	intern/audaspace/intern/AUD_SilenceReader.h
D	intern/audaspace/intern/AUD_SinusFactory.cpp
D	intern/audaspace/intern/AUD_SinusFactory.h
D	intern/audaspace/intern/AUD_SinusReader.cpp
D	intern/audaspace/intern/AUD_SinusReader.h
D	intern/audaspace/intern/AUD_SoftwareDevice.cpp
D	intern/audaspace/intern/AUD_Space.h
D	intern/audaspace/intern/AUD_StreamBufferFactory.cpp
D	intern/audaspace/intern/AUD_StreamBufferFactory.h
D	intern/audaspace/jack/AUD_JackDevice.cpp
D	intern/audaspace/jack/AUD_JackLibrary.cpp
D	intern/audaspace/jack/AUD_JackLibrary.h
D	intern/audaspace/sndfile/AUD_SndFileFactory.cpp
D	intern/audaspace/sndfile/AUD_SndFileFactory.h
D	intern/audaspace/sndfile/AUD_SndFileReader.cpp
D	intern/audaspace/sndfile/AUD_SndFileReader.h
D	intern/audaspace/sndfile/AUD_SndFileWriter.cpp
D	intern/audaspace/sndfile/AUD_SndFileWriter.h
M	source/blender/blenkernel/BKE_sound.h
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/nla.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenkernel/intern/sound.c
M	source/blender/blenkernel/intern/writeffmpeg.c
M	source/blender/editors/interface/resources.c
M	source/blender/editors/sound/CMakeLists.txt
M	source/blender/editors/sound/sound_ops.c
M	source/blender/editors/space_graph/CMakeLists.txt
M	source/blender/editors/space_graph/graph_edit.c
M	source/blender/editors/space_sequencer/CMakeLists.txt
M	source/blender/editors/space_sequencer/sequencer_add.c
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_userdef.c
M	source/blender/quicktime/CMakeLists.txt
M	source/blender/quicktime/apple/qtkit_export.m
M	source/blender/windowmanager/CMakeLists.txt
M	source/blender/windowmanager/intern/wm_playanim.c
M	source/blenderplayer/CMakeLists.txt
M	source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
M	source/gameengine/BlenderRoutines/CMakeLists.txt
M	source/gameengine/Converter/CMakeLists.txt
M	source/gameengine/Converter/KX_ConvertActuators.cpp
M	source/gameengine/GamePlayer/ghost/CMakeLists.txt
M	source/gameengine/GamePlayer/ghost/GPG_Application.cpp
M	source/gameengine/Ketsji/CMakeLists.txt
M	source/gameengine/Ketsji/KX_SoundActuator.cpp
M	source/gameengine/Ketsji/KX_SoundActuator.h

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3adf5825fa4..d6ca99e178d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,10 +392,14 @@ if(UNIX AND NOT APPLE)
 endif()
 
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-if(WITH_PYTHON_INSTALL)
-	option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
+if(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
 	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
 	mark_as_advanced(PYTHON_NUMPY_PATH)
+	set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
+	mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
+endif()
+if(WITH_PYTHON_INSTALL)
+	option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
 
 	if(UNIX AND NOT APPLE)
 		option(WITH_PYTHON_INSTALL_REQUESTS "Copy system requests into the blender install folder" ON)
@@ -700,30 +704,9 @@ TEST_SHARED_PTR_SUPPORT()
 TEST_UNORDERED_MAP_SUPPORT()
 
 if(WITH_AUDASPACE)
-	if(WITH_SYSTEM_AUDASPACE)
-		set(AUDASPACE_DEFINITIONS
-			-DWITH_AUDASPACE
-			-DWITH_SYSTEM_AUDASPACE
-			"-DAUD_DEVICE_H=<AUD_Device.h>"
-			"-DAUD_SPECIAL_H=<AUD_Special.h>"
-			"-DAUD_SOUND_H=<AUD_Sound.h>"
-			"-DAUD_HANDLE_H=<AUD_Handle.h>"
-			"-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
-			"-DAUD_TYPES_H=<AUD_Types.h>"
-			"-DAUD_PYTHON_H=<python/PyAPI.h>"
-		)
-	else()
-		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
-		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
-		set(AUDASPACE_DEFINITIONS
-			-DWITH_AUDASPACE
-			"-DAUD_DEVICE_H=<AUD_C-API.h>"
-			"-DAUD_SPECIAL_H=<AUD_C-API.h>"
-			"-DAUD_SOUND_H=<AUD_C-API.h>"
-			"-DAUD_HANDLE_H=<AUD_C-API.h>"
-			"-DAUD_SEQUENCE_H=<AUD_C-API.h>"
-			"-DAUD_TYPES_H=<AUD_Space.h>"
-		)
+	if(NOT WITH_SYSTEM_AUDASPACE)
+		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
+		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings")
 	endif()
 endif()
 
@@ -1469,10 +1452,15 @@ if(WITH_PYTHON)
 		)
 	endif()
 
-	if(WIN32 OR APPLE)
+	if(WIN32)
 		# pass, we have this in an archive to extract
-	elseif(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
-		find_python_package(numpy)
+	elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
+		if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
+			find_python_package(numpy)
+			unset(PYTHON_NUMPY_INCLUDE_DIRS CACHE)
+			set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
+		        mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
+		endif()
 	endif()
 
 	if(WIN32 OR APPLE)
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index 13368c05fbe..fb8d0d98e0e 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -16,19 +16,19 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(SNDFILE_EXTRA_ARGS)
-set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
+set(LIBSNDFILE_EXTRA_ARGS)
+set(LIBSNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
-	set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
+	set(LIBSNDFILE_ENV set ${LIBSNDFILE_ENV} &&)
 endif()
 
 ExternalProject_Add(external_sndfile
-	URL ${SNDFILE_URI}
+	URL ${LIBSNDFILE_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${SNDFILE_HASH}
+	URL_HASH MD5=${LIBSNDFILE_HASH}
 	PREFIX ${BUILD_DIR}/sndfile
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} --enable-static --disable-shared --prefix=${mingw_LIBDIR}/sndfile
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${LIBSNDFILE_ENV} ${CONFIGURE_COMMAND} --enable-static --disable-shared --prefix=${mingw_LIBDIR}/sndfile
 	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
 	INSTALL_DIR ${LIBDIR}/sndfile
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index f9f9fdcface..fe60e04ee43 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -216,9 +216,9 @@ set(LAPACK_VERSION 3.6.0)
 set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
 set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101)
 
-set(SNDFILE_VERSION 1.0.26)
-set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
-set(SNDFILE_HASH ec810a0c60c08772a8a5552704b63393)
+set(LIBSNDFILE_VERSION 1.0.26)
+set(LIBSNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${LIBSNDFILE_VERSION}.tar.gz)
+set(LIBSNDFILE_HASH ec810a0c60c08772a8a5552704b63393)
 
 #set(HIDAPI_VERSION 0.8.0-rc1)
 #set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 9f293b9e9e3..28eaa70711c 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2673,10 +2673,10 @@ install_DEB() {
   install_packages_DEB $_packages
 
   PRINT""
-  SNDFILE_DEV="libsndfile1-dev"
-  check_package_DEB $SNDFILE_DEV
+  LIBSNDFILE_DEV="libsndfile1-dev"
+  check_package_DEB $LIBSNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_DEB $SNDFILE_DEV
+    install_packages_DEB $LIBSNDFILE_DEV
   fi
 
   PRINT ""
@@ -3271,10 +3271,10 @@ install_RPM() {
   fi
 
   PRINT""
-  SNDFILE_DEV="libsndfile-devel"
-  check_package_RPM $SNDFILE_DEV
+  LIBSNDFILE_DEV="libsndfile-devel"
+  check_package_RPM $LIBSNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_RPM $SNDFILE_DEV
+    install_packages_RPM $LIBSNDFILE_DEV
   fi
 
   if [ "$WITH_ALL" = true ]; then
@@ -3678,10 +3678,10 @@ install_ARCH() {
   install_packages_ARCH $_packages
 
   PRINT""
-  SNDFILE_DEV="libsndfile"
-  check_package_ARCH $SNDFILE_DEV
+  LIBSNDFILE_DEV="libsndfile"
+  check_package_ARCH $LIBSNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_ARCH $SNDFILE_DEV
+    install_packages_ARCH $LIBSNDFILE_DEV
   fi
 
   PRINT ""
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 56f18967300..4fc6496728c 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -70,11 +70,11 @@ set(FFMPEG_LIBRARIES
 )
 
 # SndFile libraries
-set(SNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
+set(LIBSNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
-set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE)
+set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
 set(OPENAL_LIBRARY
 	${OPENAL_ROOT_DIR}/lib/libopenal.a
 	${OPENAL_ROOT_DIR}/lib/libcommon.a
diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake
index 1b685eacfbd..dd1f560e61f 100644
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@ -1,15 +1,15 @@
 # - Find SndFile library
 # Find the native SndFile includes and library
 # This module defines
-#  SNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
-#                        SNDFILE_INCLUDE_DIR is found.
-#  SNDFILE_LIBRARIES, libraries to link against to use SndFile.
-#  SNDFILE_ROOT_DIR, The base directory to search for SndFile.
+#  LIBSNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
+#                        LIBSNDFILE_INCLUDE_DIR is found.
+#  LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile.
+#  LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile.
 #                    This can also be an environment variable.
-#  SNDFILE_FOUND, If false, do not try to use SndFile.
+#  LIBSNDFILE_FOUND, If false, do not try to use SndFile.
 #
 # also defined, but not for general use are
-#  SNDFILE_LIBRARY, where to find the SndFile library.
+#  LIBSNDFILE_LIBRARY, where to find the SndFile library.
 
 #=============================================================================
 # Copyright 2011 Blender Foundation.
@@ -22,27 +22,27 @@
 # See the License for more information.
 #=============================================================================
 
-# If SNDFILE_ROOT_DIR was defined in the environment, use it.
-IF(NOT SNDFILE_ROOT_DIR AND NOT $ENV{SNDFILE_ROOT_DIR} STREQUAL "")
-  SET(SNDFILE_ROOT_DIR $ENV{SNDFILE_ROOT_DIR})
+# If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
+IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "")
+	SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})
 ENDIF()
 
 SET(_sndfile_SEARCH_DIRS
-  ${SNDFILE_ROOT_DIR}
+	${LIBSNDFILE_ROOT_DIR}
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
 )
 
-FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h
+FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h
   HINTS
     ${_sndfile_SEARCH_DIRS}
   PATH_SUFFIXES
     include
 )
 
-FIND_LIBRARY(SNDFILE_LIBRARY
+FIND_LIBRARY(LIBSNDFILE_LIBRARY
   NAMES
     sndfile
   HINTS
@@ -51,18 +51,18 @@ FIND_LIBRARY(SNDFILE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if 
 # all listed variables are TRUE
 IN

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list