diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-17 14:35:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-17 15:43:18 +0300 |
| commit | 80d1d624d378d4d8c03fb26ef286baf5479b6497 (patch) | |
| tree | d5ae6545d0318d8e0448d3a084a15e72aff6e2a5 /intern/audaspace | |
| parent | 90bf426554a7cc1d429f2dd9a02edbcbeb51ceec (diff) | |
Support dynamic loading of SDL libraries
This is mainly to address old issue when one need to have SDL library installed
in order to use our official builds. Some hip distros already installs SDL,
but it's not quite the same across all the variety of the distros.
We also now switching to SDL-2.0, most of the distros have it in repositories
already, so it shouldn't be huge deal to install it if needed.
Reviewers: campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D878
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index aa82e1da678..d2a934740d6 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -75,6 +75,7 @@ #include "AUD_MutexLock.h" #ifdef WITH_SDL +#include <SDL.h> #include "AUD_SDLDevice.h" #endif @@ -143,8 +144,14 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) break; #ifdef WITH_SDL case AUD_SDL_DEVICE: - dev = boost::shared_ptr<AUD_IDevice>(new AUD_SDLDevice(specs, buffersize)); - break; + if (SDL_Init == (void *)0) { + printf("Warning: SDL libraries are not installed\n"); + // No break, fall through to default, to return false + } + else { + dev = boost::shared_ptr<AUD_IDevice>(new AUD_SDLDevice(specs, buffersize)); + break; + } #endif #ifdef WITH_OPENAL case AUD_OPENAL_DEVICE: @@ -162,7 +169,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize) else #endif if (!AUD_jack_supported()) { - printf("Warning: Jack cllient not installed\n"); + printf("Warning: Jack client not installed\n"); // No break, fall through to default, to return false } else { |