Merge pull request #286 from raysan5/develop

Integrate develop branch

5 files changed, 12 insertions, 0 deletions

diff --git a/src/external/openal_soft/include/AL/alext.h b/src/external/openal_soft/include/AL/alext.h
index 0090c804..50ad10ec 100644
--- a/src/external/openal_soft/include/AL/alext.h
+++ b/src/external/openal_soft/include/AL/alext.h
@@ -436,6 +436,18 @@ ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCi
 #define AL_GAIN_LIMIT_SOFT                       0x200E
 #endif
 
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT                   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
+#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
+#define AL_RESAMPLER_NAME_SOFT                   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/external/openal_soft/lib/android/libopenal.so b/src/external/openal_soft/lib/android/libopenal.so
new file mode 100644
index 00000000..e384d9ad
--- /dev/null
+++ b/src/external/openal_soft/lib/android/libopenal.so
diff --git a/src/external/openal_soft/lib/win32/OpenAL32.dll b/src/external/openal_soft/lib/win32/OpenAL32.dll
index 1e3bddd5..7356f378 100644
--- a/src/external/openal_soft/lib/win32/OpenAL32.dll
+++ b/src/external/openal_soft/lib/win32/OpenAL32.dll
diff --git a/src/external/openal_soft/lib/win32/libOpenAL32.a b/src/external/openal_soft/lib/win32/libOpenAL32.a
index 3c0df3c7..9bb8ad54 100644
--- a/src/external/openal_soft/lib/win32/libOpenAL32.a
+++ b/src/external/openal_soft/lib/win32/libOpenAL32.a
diff --git a/src/external/openal_soft/lib/win32/libOpenAL32dll.a b/src/external/openal_soft/lib/win32/libOpenAL32dll.a
index 1c4c63c8..4fd3497c 100644
--- a/src/external/openal_soft/lib/win32/libOpenAL32dll.a
+++ b/src/external/openal_soft/lib/win32/libOpenAL32dll.a