diff --git a/CSFML/build/codeblocks/csfml-audio.cbp b/CSFML/build/codeblocks/csfml-audio.cbp index e083bcb0e..5ff38df05 100644 --- a/CSFML/build/codeblocks/csfml-audio.cbp +++ b/CSFML/build/codeblocks/csfml-audio.cbp @@ -51,6 +51,7 @@ + diff --git a/CSFML/build/codeblocks/csfml-graphics.cbp b/CSFML/build/codeblocks/csfml-graphics.cbp index fb534a766..adbfe06dd 100644 --- a/CSFML/build/codeblocks/csfml-graphics.cbp +++ b/CSFML/build/codeblocks/csfml-graphics.cbp @@ -53,6 +53,7 @@ + diff --git a/CSFML/build/codeblocks/csfml-main.cbp b/CSFML/build/codeblocks/csfml-main.cbp index 529865b6b..b6f8ea64d 100644 --- a/CSFML/build/codeblocks/csfml-main.cbp +++ b/CSFML/build/codeblocks/csfml-main.cbp @@ -1,46 +1,51 @@ - - - - - - + + + + + + diff --git a/CSFML/build/codeblocks/csfml-network.cbp b/CSFML/build/codeblocks/csfml-network.cbp index 1721736f8..16c1dcc8e 100644 --- a/CSFML/build/codeblocks/csfml-network.cbp +++ b/CSFML/build/codeblocks/csfml-network.cbp @@ -51,6 +51,7 @@ + diff --git a/CSFML/build/codeblocks/csfml-system.cbp b/CSFML/build/codeblocks/csfml-system.cbp index a19f7f656..2816d75aa 100644 --- a/CSFML/build/codeblocks/csfml-system.cbp +++ b/CSFML/build/codeblocks/csfml-system.cbp @@ -49,6 +49,7 @@ + diff --git a/CSFML/build/codeblocks/csfml-window.cbp b/CSFML/build/codeblocks/csfml-window.cbp index ce57e9830..b3b15fa2b 100644 --- a/CSFML/build/codeblocks/csfml-window.cbp +++ b/CSFML/build/codeblocks/csfml-window.cbp @@ -53,6 +53,7 @@ + diff --git a/DSFML/samples/dsfml/bin/openal32.dll b/DSFML/samples/dsfml/bin/openal32.dll index 28eb8e5b6..94b7a3fd5 100644 Binary files a/DSFML/samples/dsfml/bin/openal32.dll and b/DSFML/samples/dsfml/bin/openal32.dll differ diff --git a/build/codeblocks/sfml-audio.cbp b/build/codeblocks/sfml-audio.cbp index 51379f2a9..7f92df093 100644 --- a/build/codeblocks/sfml-audio.cbp +++ b/build/codeblocks/sfml-audio.cbp @@ -110,6 +110,9 @@ + + + diff --git a/build/codeblocks/sfml-graphics.cbp b/build/codeblocks/sfml-graphics.cbp index 2139d6a45..703b5c336 100644 --- a/build/codeblocks/sfml-graphics.cbp +++ b/build/codeblocks/sfml-graphics.cbp @@ -117,6 +117,9 @@ + + + diff --git a/build/codeblocks/sfml-main.cbp b/build/codeblocks/sfml-main.cbp index 46bb7822f..b923019a2 100644 --- a/build/codeblocks/sfml-main.cbp +++ b/build/codeblocks/sfml-main.cbp @@ -38,6 +38,9 @@ + + + diff --git a/build/codeblocks/sfml-network.cbp b/build/codeblocks/sfml-network.cbp index 0f32c7ae7..6ef816524 100644 --- a/build/codeblocks/sfml-network.cbp +++ b/build/codeblocks/sfml-network.cbp @@ -109,6 +109,9 @@ + + + diff --git a/build/codeblocks/sfml-system.cbp b/build/codeblocks/sfml-system.cbp index ae621ca7d..117b92e1a 100644 --- a/build/codeblocks/sfml-system.cbp +++ b/build/codeblocks/sfml-system.cbp @@ -89,6 +89,9 @@ + + + diff --git a/build/codeblocks/sfml-window.cbp b/build/codeblocks/sfml-window.cbp index 6d29c18d4..0d4e7dcb3 100644 --- a/build/codeblocks/sfml-window.cbp +++ b/build/codeblocks/sfml-window.cbp @@ -106,6 +106,7 @@ + diff --git a/dotnet/extlibs/openal32.dll b/dotnet/extlibs/openal32.dll index 28eb8e5b6..94b7a3fd5 100644 Binary files a/dotnet/extlibs/openal32.dll and b/dotnet/extlibs/openal32.dll differ diff --git a/extlibs/bin/openal32.dll b/extlibs/bin/openal32.dll index 28eb8e5b6..94b7a3fd5 100644 Binary files a/extlibs/bin/openal32.dll and b/extlibs/bin/openal32.dll differ diff --git a/extlibs/headers/AL/al.h b/extlibs/headers/AL/al.h index 630b6ad52..7e596a0bb 100644 --- a/extlibs/headers/AL/al.h +++ b/extlibs/headers/AL/al.h @@ -117,8 +117,7 @@ typedef void ALvoid; #define AL_CONE_OUTER_ANGLE 0x1002 /** - * Specify the pitch to be applied, either at source, - * or on mixer results, at listener. + * Specify the pitch to be applied at source. * Range: [0.5-2.0] * Default: 1.0 */ diff --git a/extlibs/headers/AL/alc.h b/extlibs/headers/AL/alc.h index b0bbfbe7d..dac946151 100644 --- a/extlibs/headers/AL/alc.h +++ b/extlibs/headers/AL/alc.h @@ -166,11 +166,6 @@ typedef void ALCvoid; #define ALC_ATTRIBUTES_SIZE 0x1002 #define ALC_ALL_ATTRIBUTES 0x1003 -/** - * ALC_ENUMERATE_ALL_EXT enums - */ -#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 -#define ALC_ALL_DEVICES_SPECIFIER 0x1013 /** * Capture extension diff --git a/extlibs/headers/AL/alext.h b/extlibs/headers/AL/alext.h index 2c72d9cd5..26675736f 100644 --- a/extlibs/headers/AL/alext.h +++ b/extlibs/headers/AL/alext.h @@ -25,10 +25,20 @@ extern "C" { #endif -#ifndef AL_EXT_float32 -#define AL_EXT_float32 1 -#define AL_FORMAT_MONO_FLOAT32 0x10010 -#define AL_FORMAT_STEREO_FLOAT32 0x10011 +#ifndef AL_LOKI_IMA_ADPCM_format +#define AL_LOKI_IMA_ADPCM_format 1 +#define AL_FORMAT_IMA_ADPCM_MONO16_EXT 0x10000 +#define AL_FORMAT_IMA_ADPCM_STEREO16_EXT 0x10001 +#endif + +#ifndef AL_LOKI_WAVE_format +#define AL_LOKI_WAVE_format 1 +#define AL_FORMAT_WAVE_EXT 0x10002 +#endif + +#ifndef AL_EXT_vorbis +#define AL_EXT_vorbis 1 +#define AL_FORMAT_VORBIS_EXT 0x10003 #endif #ifndef AL_LOKI_quadriphonic @@ -37,6 +47,31 @@ extern "C" { #define AL_FORMAT_QUAD16_LOKI 0x10005 #endif +#ifndef AL_EXT_float32 +#define AL_EXT_float32 1 +#define AL_FORMAT_MONO_FLOAT32 0x10010 +#define AL_FORMAT_STEREO_FLOAT32 0x10011 +#endif + +#ifndef AL_EXT_double +#define AL_EXT_double 1 +#define AL_FORMAT_MONO_DOUBLE_EXT 0x10012 +#define AL_FORMAT_STEREO_DOUBLE_EXT 0x10013 +#endif + +#ifndef ALC_LOKI_audio_channel +#define ALC_LOKI_audio_channel 1 +#define ALC_CHAN_MAIN_LOKI 0x500001 +#define ALC_CHAN_PCM_LOKI 0x500002 +#define ALC_CHAN_CD_LOKI 0x500003 +#endif + +#ifndef ALC_ENUMERATE_ALL_EXT +#define ALC_ENUMERATE_ALL_EXT 1 +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 +#endif + #ifndef AL_EXT_MCFORMATS #define AL_EXT_MCFORMATS 1 #define AL_FORMAT_QUAD8 0x1204 @@ -62,6 +97,70 @@ extern "C" { #define AL_FORMAT_STEREO_IMA4 0x1301 #endif +#ifndef AL_EXT_buffer_sub_data +#define AL_EXT_buffer_sub_data 1 +#define AL_BYTE_RW_OFFSETS_EXT 0x1031 +#define AL_SAMPLE_RW_OFFSETS_EXT 0x1032 +#define AL_SEC_RW_OFFSETS_EXT 0x1033 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATAEXTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); +#endif + +#ifndef AL_EXT_STATIC_BUFFER +#define AL_EXT_STATIC_BUFFER 1 +typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); +#endif + +#ifndef AL_EXT_sample_buffer_object +#define AL_EXT_sample_buffer_object 1 +#define AL_SAMPLE_SOURCE_EXT 0x1040 +#define AL_SAMPLE_SINK_EXT 0x1041 +#define AL_READ_ONLY_EXT 0x1042 +#define AL_WRITE_ONLY_EXT 0x1043 +#define AL_READ_WRITE_EXT 0x1044 +#define AL_STREAM_WRITE_EXT 0x1045 +#define AL_STREAM_READ_EXT 0x1046 +#define AL_STREAM_COPY_EXT 0x1047 +#define AL_STATIC_WRITE_EXT 0x1048 +#define AL_STATIC_READ_EXT 0x1049 +#define AL_STATIC_COPY_EXT 0x104A +#define AL_DYNAMIC_WRITE_EXT 0x104B +#define AL_DYNAMIC_READ_EXT 0x104C +#define AL_DYNAMIC_COPY_EXT 0x104D +typedef ALvoid (AL_APIENTRY*PFNALGENDATABUFFERSEXTPROC)(ALsizei n,ALuint *puiBuffers); +typedef ALvoid (AL_APIENTRY*PFNALDELETEDATABUFFERSEXTPROC)(ALsizei n, const ALuint *puiBuffers); +typedef ALboolean (AL_APIENTRY*PFNALISDATABUFFEREXTPROC)(ALuint uiBuffer); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERDATAEXTPROC)(ALuint buffer,const ALvoid *data,ALsizei size,ALenum usage); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALuint start, ALsizei length, const ALvoid *); +typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALuint start, ALsizei length, ALvoid *); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFEXTPROC)(ALuint buffer, ALenum eParam, ALfloat flValue); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFVEXTPROC)(ALuint buffer, ALenum eParam, const ALfloat* flValues); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint lValue); +typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERIVEXTPROC)(ALuint buffer, ALenum eParam, const ALint* plValues); +typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERFEXTPROC)(ALuint buffer, ALenum eParam, ALfloat *pflValue); +typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERFVEXTPROC)(ALuint buffer, ALenum eParam, ALfloat* pflValues); +typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint *plValue); +typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIVEXTPROC)(ALuint buffer, ALenum eParam, ALint* plValues); +typedef ALvoid (AL_APIENTRY*PFNALSELECTDATABUFFEREXTPROC)(ALenum target, ALuint uiBuffer); +typedef ALvoid* (AL_APIENTRY*PFNALMAPDATABUFFEREXTPROC)(ALuint uiBuffer, ALuint start, ALsizei length, ALenum access); +typedef ALvoid (AL_APIENTRY*PFNALUNMAPDATABUFFEREXTPROC)(ALuint uiBuffer); +#endif + +#ifndef ALC_EXT_disconnect +#define ALC_EXT_disconnect 1 +#define ALC_CONNECTED 0x313 +#endif + +#ifndef ALC_EXT_thread_local_context +#define ALC_EXT_thread_local_context 1 +typedef ALCboolean (ALC_APIENTRY*PFNALCMAKECURRENTPROC)(ALCcontext *context); +typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void); +#endif + +#ifndef AL_EXT_source_distance_model +#define AL_EXT_source_distance_model 1 +#define AL_SOURCE_DISTANCE_MODEL 0x200 +#endif + #ifdef __cplusplus } #endif diff --git a/extlibs/libs-mingw/libopenal32.a b/extlibs/libs-mingw/libopenal32.a index 234838e45..178945047 100644 Binary files a/extlibs/libs-mingw/libopenal32.a and b/extlibs/libs-mingw/libopenal32.a differ diff --git a/extlibs/libs-vc2005/OpenAL32.lib b/extlibs/libs-vc2005/OpenAL32.lib index 855c94da0..2800a1211 100644 Binary files a/extlibs/libs-vc2005/OpenAL32.lib and b/extlibs/libs-vc2005/OpenAL32.lib differ diff --git a/samples/bin/openal32.dll b/samples/bin/openal32.dll index 28eb8e5b6..94b7a3fd5 100644 Binary files a/samples/bin/openal32.dll and b/samples/bin/openal32.dll differ diff --git a/samples/build/codeblocks/ftp.cbp b/samples/build/codeblocks/ftp.cbp index f87ee4f06..b12d3cb45 100644 --- a/samples/build/codeblocks/ftp.cbp +++ b/samples/build/codeblocks/ftp.cbp @@ -51,6 +51,9 @@ + + + diff --git a/samples/build/codeblocks/opengl.cbp b/samples/build/codeblocks/opengl.cbp index 8868fc163..499db3728 100644 --- a/samples/build/codeblocks/opengl.cbp +++ b/samples/build/codeblocks/opengl.cbp @@ -61,6 +61,9 @@ + + + diff --git a/samples/build/codeblocks/pong.cbp b/samples/build/codeblocks/pong.cbp index 89ca3a3ec..4248cca03 100644 --- a/samples/build/codeblocks/pong.cbp +++ b/samples/build/codeblocks/pong.cbp @@ -63,6 +63,9 @@ + + + diff --git a/samples/build/codeblocks/qt.cbp b/samples/build/codeblocks/qt.cbp index 8993d16f4..a2395afec 100644 --- a/samples/build/codeblocks/qt.cbp +++ b/samples/build/codeblocks/qt.cbp @@ -84,6 +84,9 @@ + + + diff --git a/samples/build/codeblocks/shader.cbp b/samples/build/codeblocks/shader.cbp index da3cd591c..e058a2918 100644 --- a/samples/build/codeblocks/shader.cbp +++ b/samples/build/codeblocks/shader.cbp @@ -57,6 +57,9 @@ + + + diff --git a/samples/build/codeblocks/sockets.cbp b/samples/build/codeblocks/sockets.cbp index 5a75afe32..ab68adc40 100644 --- a/samples/build/codeblocks/sockets.cbp +++ b/samples/build/codeblocks/sockets.cbp @@ -51,6 +51,9 @@ + + + diff --git a/samples/build/codeblocks/sound-capture.cbp b/samples/build/codeblocks/sound-capture.cbp index 35c5b66fe..85effe3f4 100644 --- a/samples/build/codeblocks/sound-capture.cbp +++ b/samples/build/codeblocks/sound-capture.cbp @@ -53,6 +53,9 @@ + + + diff --git a/samples/build/codeblocks/sound.cbp b/samples/build/codeblocks/sound.cbp index e7e308f20..804778dce 100644 --- a/samples/build/codeblocks/sound.cbp +++ b/samples/build/codeblocks/sound.cbp @@ -24,6 +24,7 @@ + diff --git a/samples/build/codeblocks/voip.cbp b/samples/build/codeblocks/voip.cbp index d774f43a4..05ee609ff 100644 --- a/samples/build/codeblocks/voip.cbp +++ b/samples/build/codeblocks/voip.cbp @@ -55,6 +55,9 @@ + + + diff --git a/samples/build/codeblocks/win32.cbp b/samples/build/codeblocks/win32.cbp index 1296a5321..211cc622e 100644 --- a/samples/build/codeblocks/win32.cbp +++ b/samples/build/codeblocks/win32.cbp @@ -55,6 +55,9 @@ + + + diff --git a/samples/build/codeblocks/window.cbp b/samples/build/codeblocks/window.cbp index 929aaf870..59d116b1e 100644 --- a/samples/build/codeblocks/window.cbp +++ b/samples/build/codeblocks/window.cbp @@ -57,6 +57,9 @@ + + + diff --git a/samples/build/codeblocks/wxwidgets.cbp b/samples/build/codeblocks/wxwidgets.cbp index 822c22b44..a5c6f4fb7 100644 --- a/samples/build/codeblocks/wxwidgets.cbp +++ b/samples/build/codeblocks/wxwidgets.cbp @@ -79,6 +79,9 @@ + + +