Upgraded to the latest version of OpenAL Soft (1.11.753) on Windows

Fixed linker settings for Code::Blocks projects so that libgcc_s_dw2-1.dll is not required when compiling with gcc 4

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1432 4e206d99-4929-0410-ac5d-dfc041789085

CSFML/build/codeblocks/csfml-audio.cbp

@@ -51,6 +51,7 @@
 			<Add directory="..\..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add directory="..\..\..\lib\mingw" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\Audio\Listener.h" />

CSFML/build/codeblocks/csfml-graphics.cbp

@@ -53,6 +53,7 @@
 			<Add directory="..\..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add directory="..\..\..\lib\mingw" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\Graphics\BlendMode.h" />

CSFML/build/codeblocks/csfml-main.cbp

@@ -1,46 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
+<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
+	<FileVersion major="1" minor="6" />
-	<Project>
+	<Project>
-		<Option title="csfml-main" />
+		<Option title="csfml-main" />
-		<Option pch_mode="2" />
+		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="gcc" />
-		<Build>
+		<Build>
-			<Target title="Debug_Win32">
+			<Target title="Debug_Win32">
-				<Option output="..\..\lib\mingw\libcsfml-main-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libcsfml-main-d" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
+				<Option working_dir="" />
-				<Option object_output="..\..\Temp\codeblocks\csfml-main\Debug_Win32" />
+				<Option object_output="..\..\Temp\codeblocks\csfml-main\Debug_Win32" />
-				<Option type="2" />
+				<Option type="2" />
-				<Option compiler="gcc" />
+				<Option compiler="gcc" />
-				<Option createDefFile="1" />
+				<Option createDefFile="1" />
-				<Compiler>
+				<Compiler>
-					<Add option="-Wall" />
+					<Add option="-Wall" />
-					<Add option="-g" />
+					<Add option="-g" />
-					<Add option="-O0" />
+					<Add option="-O0" />
-					<Add option="-DWIN32" />
+					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
+					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
+					<Add option="-D_LIB" />
-				</Compiler>
+				</Compiler>
-			</Target>
+				<Linker>
-			<Target title="Release_Win32">
+					<Add option="-static-libgcc" />
-				<Option output="..\..\lib\mingw\libcsfml-main.a" prefix_auto="1" extension_auto="1" />
+				</Linker>
-				<Option working_dir="" />
+			</Target>
-				<Option object_output="..\..\Temp\codeblocks\csfml-main\Release_Win32" />
+			<Target title="Release_Win32">
-				<Option type="2" />
+				<Option output="..\..\lib\mingw\libcsfml-main" prefix_auto="1" extension_auto="1" />
-				<Option compiler="gcc" />
+				<Option working_dir="" />
-				<Option createDefFile="1" />
+				<Option object_output="..\..\Temp\codeblocks\csfml-main\Release_Win32" />
-				<Compiler>
+				<Option type="2" />
-					<Add option="-O3" />
+				<Option compiler="gcc" />
-					<Add option="-Wall" />
+				<Option createDefFile="1" />
-					<Add option="-DWIN32" />
+				<Compiler>
-					<Add option="-DNDEBUG" />
+					<Add option="-O3" />
-					<Add option="-D_LIB" />
+					<Add option="-Wall" />
-				</Compiler>
+					<Add option="-DWIN32" />
-			</Target>
+					<Add option="-DNDEBUG" />
-		</Build>
+					<Add option="-D_LIB" />
-		<Unit filename="..\..\src\SFML\Main\SFML_Main.cpp" />
+				</Compiler>
-		<Extensions>
+			</Target>
-			<code_completion />
+		</Build>
-		</Extensions>
+		<Unit filename="..\..\src\SFML\Main\SFML_Main.cpp" />
-	</Project>
+		<Extensions>
-</CodeBlocks_project_file>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

CSFML/build/codeblocks/csfml-network.cbp

@@ -51,6 +51,7 @@
 			<Add directory="..\..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add directory="..\..\..\lib\mingw" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\Network\Ftp.h" />

CSFML/build/codeblocks/csfml-system.cbp

@@ -49,6 +49,7 @@
 			<Add directory="..\..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add directory="..\..\..\lib\mingw" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\System\Clock.h" />

CSFML/build/codeblocks/csfml-window.cbp

@@ -53,6 +53,7 @@
 			<Add directory="..\..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add directory="..\..\..\lib\mingw" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\Window\Context.h" />

build/codeblocks/sfml-audio.cbp

@@ -110,6 +110,9 @@
 			<Add directory="..\..\src" />
 			<Add directory="..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\include\SFML\Audio\Listener.hpp" />
 		<Unit filename="..\..\include\SFML\Audio\Music.hpp" />
 		<Unit filename="..\..\include\SFML\Audio\Sound.hpp" />

build/codeblocks/sfml-graphics.cbp

@@ -117,6 +117,9 @@
 			<Add directory="..\..\extlibs\headers" />
 			<Add directory="..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\include\SFML\Graphics\Color.hpp" />
 		<Unit filename="..\..\include\SFML\Graphics\Drawable.hpp" />
 		<Unit filename="..\..\include\SFML\Graphics\Font.hpp" />

build/codeblocks/sfml-main.cbp

@@ -38,6 +38,9 @@
 				</Compiler>
 			</Target>
 		</Build>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\src\SFML\Main\SFML_Main.cpp" />
 		<Extensions>
 			<code_completion />

build/codeblocks/sfml-network.cbp

@@ -109,6 +109,9 @@
 			<Add directory="..\..\src" />
 			<Add directory="..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\include\SFML\Network\Ftp.hpp" />
 		<Unit filename="..\..\include\SFML\Network\Http.hpp" />
 		<Unit filename="..\..\include\SFML\Network\IPAddress.hpp" />

build/codeblocks/sfml-system.cbp

@@ -89,6 +89,9 @@
 			<Add directory="..\..\src" />
 			<Add directory="..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\include\SFML\System\Clock.hpp" />
 		<Unit filename="..\..\include\SFML\System\Err.hpp" />
 		<Unit filename="..\..\include\SFML\System\Lock.hpp" />

build/codeblocks/sfml-window.cbp

@@ -106,6 +106,7 @@
 			<Add directory="..\..\include" />
 		</Compiler>
 		<Linker>
+			<Add option="-static-libgcc" />
 			<Add library="libgdi32.a" />
 		</Linker>
 		<Unit filename="..\..\include\SFML\Window\Context.hpp" />

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,
+ * Specify the pitch to be applied at source.
- *  or on mixer results, at listener.
  * Range:   [0.5-2.0]
  * Default: 1.0
  */

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

extlibs/headers/AL/alext.h

@@ -25,10 +25,20 @@
 extern "C" {
 #endif
 
-#ifndef AL_EXT_float32
+#ifndef AL_LOKI_IMA_ADPCM_format
-#define AL_EXT_float32 1
+#define AL_LOKI_IMA_ADPCM_format 1
-#define AL_FORMAT_MONO_FLOAT32                   0x10010
+#define AL_FORMAT_IMA_ADPCM_MONO16_EXT           0x10000
-#define AL_FORMAT_STEREO_FLOAT32                 0x10011
+#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

samples/build/codeblocks/ftp.cbp

@@ -51,6 +51,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\ftp\Ftp.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/opengl.cbp

@@ -61,6 +61,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\opengl\OpenGL.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/pong.cbp

@@ -63,6 +63,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\pong\Pong.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/qt.cbp

@@ -84,6 +84,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\qt\Main.cpp" />
 		<Unit filename="..\..\qt\QSFMLCanvas.cpp" />
 		<Unit filename="..\..\qt\QSFMLCanvas.hpp" />

samples/build/codeblocks/shader.cbp

@@ -57,6 +57,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\shader\Shader.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/sockets.cbp

@@ -51,6 +51,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\sockets\Sockets.cpp" />
 		<Unit filename="..\..\sockets\TCP.cpp" />
 		<Unit filename="..\..\sockets\UDP.cpp" />

samples/build/codeblocks/sound-capture.cbp

@@ -53,6 +53,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\sound_capture\SoundCapture.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/sound.cbp

@@ -24,6 +24,7 @@
 					<Add directory="..\..\..\extlibs" />
 				</ResourceCompiler>
 				<Linker>
+					<Add option="-static-libgcc" />
 					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
 					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
 				</Linker>

samples/build/codeblocks/voip.cbp

@@ -55,6 +55,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\voip\Client.cpp" />
 		<Unit filename="..\..\voip\Server.cpp" />
 		<Unit filename="..\..\voip\VoIP.cpp" />

samples/build/codeblocks/win32.cbp

@@ -55,6 +55,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\win32\Win32.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/window.cbp

@@ -57,6 +57,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\window\Window.cpp" />
 		<Extensions>
 			<code_completion />

samples/build/codeblocks/wxwidgets.cbp

@@ -79,6 +79,9 @@
 		<Compiler>
 			<Add directory="..\..\..\include" />
 		</Compiler>
+		<Linker>
+			<Add option="-static-libgcc" />
+		</Linker>
 		<Unit filename="..\..\wxwidgets\Main.cpp" />
 		<Unit filename="..\..\wxwidgets\wxSFMLCanvas.cpp" />
 		<Unit filename="..\..\wxwidgets\wxSFMLCanvas.hpp" />