diff --git a/CSFML/build/codeblocks/csfml-audio.cbp b/CSFML/build/codeblocks/csfml-audio.cbp
index 401d15055..9e22afa75 100644
--- a/CSFML/build/codeblocks/csfml-audio.cbp
+++ b/CSFML/build/codeblocks/csfml-audio.cbp
@@ -1,76 +1,78 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="csfml-audio" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-audio-d.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-audio\Debug DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-audio-s-d" />
-					<Add option="-lsfml-system-s-d" />
-				</Linker>
-			</Target>
-			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-audio.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-audio\Release DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-audio-s" />
-					<Add option="-lsfml-system-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\src" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add directory="..\..\..\lib\mingw" />
-		</Linker>
-		<Unit filename="..\..\include\SFML\Audio\Listener.h" />
-		<Unit filename="..\..\include\SFML\Audio\Music.h" />
-		<Unit filename="..\..\include\SFML\Audio\Sound.h" />
-		<Unit filename="..\..\include\SFML\Audio\SoundBuffer.h" />
-		<Unit filename="..\..\include\SFML\Audio\SoundBufferRecorder.h" />
-		<Unit filename="..\..\include\SFML\Audio\SoundRecorder.h" />
-		<Unit filename="..\..\include\SFML\Audio\SoundStatus.h" />
-		<Unit filename="..\..\include\SFML\Audio\SoundStream.h" />
-		<Unit filename="..\..\include\SFML\Audio\Types.h" />
-		<Unit filename="..\..\src\SFML\Audio\Listener.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\Music.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\Sound.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\SoundBuffer.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\SoundBufferRecorder.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\SoundRecorder.cpp" />
-		<Unit filename="..\..\src\SFML\Audio\SoundStream.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="csfml-audio" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-audio-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-audio\Debug DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-audio-s-d" />
+					<Add option="-lsfml-system-s-d" />
+				</Linker>
+			</Target>
+			<Target title="Release DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-audio" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-audio\Release DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-audio-s" />
+					<Add option="-lsfml-system-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\src" />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Linker>
+			<Add directory="..\..\..\lib\mingw" />
+		</Linker>
+		<Unit filename="..\..\include\SFML\Audio\Listener.h" />
+		<Unit filename="..\..\include\SFML\Audio\Music.h" />
+		<Unit filename="..\..\include\SFML\Audio\Sound.h" />
+		<Unit filename="..\..\include\SFML\Audio\SoundBuffer.h" />
+		<Unit filename="..\..\include\SFML\Audio\SoundBufferRecorder.h" />
+		<Unit filename="..\..\include\SFML\Audio\SoundRecorder.h" />
+		<Unit filename="..\..\include\SFML\Audio\SoundStatus.h" />
+		<Unit filename="..\..\include\SFML\Audio\SoundStream.h" />
+		<Unit filename="..\..\include\SFML\Audio\Types.h" />
+		<Unit filename="..\..\src\SFML\Audio\Listener.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\Music.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\Sound.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\SoundBuffer.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\SoundBufferRecorder.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\SoundRecorder.cpp" />
+		<Unit filename="..\..\src\SFML\Audio\SoundStream.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/CSFML/build/codeblocks/csfml-graphics.cbp b/CSFML/build/codeblocks/csfml-graphics.cbp
index a1410075b..884f3fa99 100644
--- a/CSFML/build/codeblocks/csfml-graphics.cbp
+++ b/CSFML/build/codeblocks/csfml-graphics.cbp
@@ -1,84 +1,86 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="csfml-graphics" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-graphics-d.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-graphics\Debug DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-graphics-s-d" />
-					<Add option="-lsfml-window-s-d" />
-					<Add option="-lsfml-system-s-d" />
-				</Linker>
-			</Target>
-			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-graphics.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-graphics\Release DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-graphics-s" />
-					<Add option="-lsfml-window-s" />
-					<Add option="-lsfml-system-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\src" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add directory="..\..\..\lib\mingw" />
-		</Linker>
-		<Unit filename="..\..\include\SFML\Graphics\BlendMode.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Color.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Font.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Image.h" />
-		<Unit filename="..\..\include\SFML\Graphics\PostFX.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Rect.h" />
-		<Unit filename="..\..\include\SFML\Graphics\RenderWindow.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Shape.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Sprite.h" />
-		<Unit filename="..\..\include\SFML\Graphics\String.h" />
-		<Unit filename="..\..\include\SFML\Graphics\Types.h" />
-		<Unit filename="..\..\include\SFML\Graphics\View.h" />
-		<Unit filename="..\..\src\SFML\Graphics\Color.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\Font.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\Image.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\PostFX.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\Rect.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\RenderWindow.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\Shape.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\Sprite.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\String.cpp" />
-		<Unit filename="..\..\src\SFML\Graphics\View.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="csfml-graphics" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-graphics-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-graphics\Debug DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-graphics-s-d" />
+					<Add option="-lsfml-window-s-d" />
+					<Add option="-lsfml-system-s-d" />
+				</Linker>
+			</Target>
+			<Target title="Release DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-graphics" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-graphics\Release DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-graphics-s" />
+					<Add option="-lsfml-window-s" />
+					<Add option="-lsfml-system-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\src" />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Linker>
+			<Add directory="..\..\..\lib\mingw" />
+		</Linker>
+		<Unit filename="..\..\include\SFML\Graphics\BlendMode.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Color.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Font.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Image.h" />
+		<Unit filename="..\..\include\SFML\Graphics\PostFX.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Rect.h" />
+		<Unit filename="..\..\include\SFML\Graphics\RenderWindow.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Shape.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Sprite.h" />
+		<Unit filename="..\..\include\SFML\Graphics\String.h" />
+		<Unit filename="..\..\include\SFML\Graphics\Types.h" />
+		<Unit filename="..\..\include\SFML\Graphics\View.h" />
+		<Unit filename="..\..\src\SFML\Graphics\Color.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\Font.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\Image.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\PostFX.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\Rect.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\RenderWindow.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\Shape.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\Sprite.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\String.cpp" />
+		<Unit filename="..\..\src\SFML\Graphics\View.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/CSFML/build/codeblocks/csfml-network.cbp b/CSFML/build/codeblocks/csfml-network.cbp
index 9344bfdb1..8c183f380 100644
--- a/CSFML/build/codeblocks/csfml-network.cbp
+++ b/CSFML/build/codeblocks/csfml-network.cbp
@@ -1,76 +1,78 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="csfml-network" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-network-d.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-network\Debug DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-network-s-d" />
-					<Add option="-lsfml-system-s-d" />
-				</Linker>
-			</Target>
-			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-network.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-network\Release DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-network-s" />
-					<Add option="-lsfml-system-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\src" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add directory="..\..\..\lib\mingw" />
-		</Linker>
-		<Unit filename="..\..\include\SFML\Network\Ftp.h" />
-		<Unit filename="..\..\include\SFML\Network\Http.h" />
-		<Unit filename="..\..\include\SFML\Network\IPAddress.h" />
-		<Unit filename="..\..\include\SFML\Network\Packet.h" />
-		<Unit filename="..\..\include\SFML\Network\Selector.h" />
-		<Unit filename="..\..\include\SFML\Network\SocketStatus.h" />
-		<Unit filename="..\..\include\SFML\Network\SocketTCP.h" />
-		<Unit filename="..\..\include\SFML\Network\SocketUDP.h" />
-		<Unit filename="..\..\include\SFML\Network\Types.h" />
-		<Unit filename="..\..\src\SFML\Network\Ftp.cpp" />
-		<Unit filename="..\..\src\SFML\Network\Http.cpp" />
-		<Unit filename="..\..\src\SFML\Network\IPAddress.cpp" />
-		<Unit filename="..\..\src\SFML\Network\Packet.cpp" />
-		<Unit filename="..\..\src\SFML\Network\Selector.cpp" />
-		<Unit filename="..\..\src\SFML\Network\SocketTCP.cpp" />
-		<Unit filename="..\..\src\SFML\Network\SocketUDP.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="csfml-network" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-network-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-network\Debug DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-network-s-d" />
+					<Add option="-lsfml-system-s-d" />
+				</Linker>
+			</Target>
+			<Target title="Release DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-network" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-network\Release DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-network-s" />
+					<Add option="-lsfml-system-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\src" />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Linker>
+			<Add directory="..\..\..\lib\mingw" />
+		</Linker>
+		<Unit filename="..\..\include\SFML\Network\Ftp.h" />
+		<Unit filename="..\..\include\SFML\Network\Http.h" />
+		<Unit filename="..\..\include\SFML\Network\IPAddress.h" />
+		<Unit filename="..\..\include\SFML\Network\Packet.h" />
+		<Unit filename="..\..\include\SFML\Network\Selector.h" />
+		<Unit filename="..\..\include\SFML\Network\SocketStatus.h" />
+		<Unit filename="..\..\include\SFML\Network\SocketTCP.h" />
+		<Unit filename="..\..\include\SFML\Network\SocketUDP.h" />
+		<Unit filename="..\..\include\SFML\Network\Types.h" />
+		<Unit filename="..\..\src\SFML\Network\Ftp.cpp" />
+		<Unit filename="..\..\src\SFML\Network\Http.cpp" />
+		<Unit filename="..\..\src\SFML\Network\IPAddress.cpp" />
+		<Unit filename="..\..\src\SFML\Network\Packet.cpp" />
+		<Unit filename="..\..\src\SFML\Network\Selector.cpp" />
+		<Unit filename="..\..\src\SFML\Network\SocketTCP.cpp" />
+		<Unit filename="..\..\src\SFML\Network\SocketUDP.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/CSFML/build/codeblocks/csfml-system.cbp b/CSFML/build/codeblocks/csfml-system.cbp
index a455330db..f1cf47a49 100644
--- a/CSFML/build/codeblocks/csfml-system.cbp
+++ b/CSFML/build/codeblocks/csfml-system.cbp
@@ -1,69 +1,71 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="csfml-system" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-system-d.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-system\Debug DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-system-s-d" />
-				</Linker>
-			</Target>
-			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-system.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-system\Release DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-system-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\src" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add directory="..\..\..\lib\mingw" />
-		</Linker>
-		<Unit filename="..\..\include\SFML\System\Clock.h" />
-		<Unit filename="..\..\include\SFML\System\Mutex.h" />
-		<Unit filename="..\..\include\SFML\System\Randomizer.h" />
-		<Unit filename="..\..\include\SFML\System\Sleep.h" />
-		<Unit filename="..\..\include\SFML\System\Thread.h" />
-		<Unit filename="..\..\include\SFML\System\Types.h" />
-		<Unit filename="..\..\src\SFML\System\Clock.cpp" />
-		<Unit filename="..\..\src\SFML\System\Mutex.cpp" />
-		<Unit filename="..\..\src\SFML\System\Randomizer.cpp" />
-		<Unit filename="..\..\src\SFML\System\Sleep.cpp" />
-		<Unit filename="..\..\src\SFML\System\Thread.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="csfml-system" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-system-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-system\Debug DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-system-s-d" />
+				</Linker>
+			</Target>
+			<Target title="Release DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-system" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-system\Release DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-system-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\src" />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Linker>
+			<Add directory="..\..\..\lib\mingw" />
+		</Linker>
+		<Unit filename="..\..\include\SFML\System\Clock.h" />
+		<Unit filename="..\..\include\SFML\System\Mutex.h" />
+		<Unit filename="..\..\include\SFML\System\Randomizer.h" />
+		<Unit filename="..\..\include\SFML\System\Sleep.h" />
+		<Unit filename="..\..\include\SFML\System\Thread.h" />
+		<Unit filename="..\..\include\SFML\System\Types.h" />
+		<Unit filename="..\..\src\SFML\System\Clock.cpp" />
+		<Unit filename="..\..\src\SFML\System\Mutex.cpp" />
+		<Unit filename="..\..\src\SFML\System\Randomizer.cpp" />
+		<Unit filename="..\..\src\SFML\System\Sleep.cpp" />
+		<Unit filename="..\..\src\SFML\System\Thread.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/CSFML/build/codeblocks/csfml-window.cbp b/CSFML/build/codeblocks/csfml-window.cbp
index b6b53a89c..3c603655b 100644
--- a/CSFML/build/codeblocks/csfml-window.cbp
+++ b/CSFML/build/codeblocks/csfml-window.cbp
@@ -1,73 +1,75 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="csfml-window" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-window-d.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-window\Debug DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-					<Add option="-DGLEW_BUILD" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-window-s-d" />
-					<Add option="-lsfml-system-s-d" />
-				</Linker>
-			</Target>
-			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\csfml-window.dll" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\Temp\csfml-window\Release DLL_Win32" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_LIB" />
-					<Add option="-DCSFML_EXPORTS" />
-					<Add option="-DGLEW_BUILD" />
-				</Compiler>
-				<Linker>
-					<Add option="-lsfml-window-s" />
-					<Add option="-lsfml-system-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\src" />
-			<Add directory="..\..\include" />
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Linker>
-			<Add directory="..\..\..\lib\mingw" />
-		</Linker>
-		<Unit filename="..\..\include\SFML\Window\Context.h" />
-		<Unit filename="..\..\include\SFML\Window\Event.h" />
-		<Unit filename="..\..\include\SFML\Window\Input.h" />
-		<Unit filename="..\..\include\SFML\Window\Types.h" />
-		<Unit filename="..\..\include\SFML\Window\VideoMode.h" />
-		<Unit filename="..\..\include\SFML\Window\Window.h" />
-		<Unit filename="..\..\include\SFML\Window\WindowHandle.h" />
-		<Unit filename="..\..\src\SFML\Window\Context.cpp" />
-		<Unit filename="..\..\src\SFML\Window\Input.cpp" />
-		<Unit filename="..\..\src\SFML\Window\VideoMode.cpp" />
-		<Unit filename="..\..\src\SFML\Window\Window.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="csfml-window" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-window-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-window\Debug DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+					<Add option="-DGLEW_BUILD" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-window-s-d" />
+					<Add option="-lsfml-system-s-d" />
+				</Linker>
+			</Target>
+			<Target title="Release DLL_Win32">
+				<Option output="..\..\lib\mingw\csfml-window" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\Temp\csfml-window\Release DLL_Win32" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_LIB" />
+					<Add option="-DCSFML_EXPORTS" />
+					<Add option="-DGLEW_BUILD" />
+				</Compiler>
+				<Linker>
+					<Add option="-lsfml-window-s" />
+					<Add option="-lsfml-system-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\src" />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Linker>
+			<Add directory="..\..\..\lib\mingw" />
+		</Linker>
+		<Unit filename="..\..\include\SFML\Window\Context.h" />
+		<Unit filename="..\..\include\SFML\Window\Event.h" />
+		<Unit filename="..\..\include\SFML\Window\Input.h" />
+		<Unit filename="..\..\include\SFML\Window\Types.h" />
+		<Unit filename="..\..\include\SFML\Window\VideoMode.h" />
+		<Unit filename="..\..\include\SFML\Window\Window.h" />
+		<Unit filename="..\..\include\SFML\Window\WindowHandle.h" />
+		<Unit filename="..\..\src\SFML\Window\Context.cpp" />
+		<Unit filename="..\..\src\SFML\Window\Input.cpp" />
+		<Unit filename="..\..\src\SFML\Window\VideoMode.cpp" />
+		<Unit filename="..\..\src\SFML\Window\Window.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-audio.cbp b/build/codeblocks/sfml-audio.cbp
index b5920b97b..f51722c33 100644
--- a/build/codeblocks/sfml-audio.cbp
+++ b/build/codeblocks/sfml-audio.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-audio-d.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-audio-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-audio\Debug DLL_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
 				<Option type="3" />
@@ -35,7 +35,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-audio.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-audio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-audio\Release DLL_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
 				<Option type="3" />
@@ -62,7 +62,7 @@
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-audio-s-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-audio-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-audio\Debug static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
@@ -84,7 +84,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-audio-s.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-audio-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-audio\Release static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
@@ -141,6 +141,8 @@
 		<Unit filename="..\..\src\SFML\Audio\stb_vorbis\stb_vorbis.h" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-graphics.cbp b/build/codeblocks/sfml-graphics.cbp
index c7ec569bf..a6a61142d 100644
--- a/build/codeblocks/sfml-graphics.cbp
+++ b/build/codeblocks/sfml-graphics.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-graphics-d.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-graphics-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-graphics\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -36,7 +36,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-graphics.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-graphics" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-graphics\Release DLL_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-window.a;..\lib\mingw\libsfml-system.a;" />
 				<Option type="3" />
@@ -66,7 +66,7 @@
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-graphics-s-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-graphics-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-graphics\Debug static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-window-s-d.a;..\lib\mingw\libsfml-system-s-d.a;" />
@@ -89,7 +89,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-graphics-s.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-graphics-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-graphics\Release static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-window-s.a;..\lib\mingw\libsfml-system-s.a;" />
@@ -417,6 +417,8 @@
 		<Unit filename="..\..\src\SFML\Graphics\zlib\zutil.h" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-main.cbp b/build/codeblocks/sfml-main.cbp
index 66781f3a1..05320435a 100644
--- a/build/codeblocks/sfml-main.cbp
+++ b/build/codeblocks/sfml-main.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-main-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-main\Debug_Win32" />
 				<Option type="2" />
@@ -23,7 +23,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\lib\mingw\libsfml-main.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-main" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-main\Release_Win32" />
 				<Option type="2" />
@@ -41,6 +41,8 @@
 		<Unit filename="..\..\src\SFML\Main\SFML_Main.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-network.cbp b/build/codeblocks/sfml-network.cbp
index d5824de1b..df5312e80 100644
--- a/build/codeblocks/sfml-network.cbp
+++ b/build/codeblocks/sfml-network.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-network-d.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-network-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-network\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -32,7 +32,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-network.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-network" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-network\Release DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -56,7 +56,7 @@
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-network-s-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-network-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-network\Debug static_Win32" />
 				<Option type="2" />
@@ -80,7 +80,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-network-s.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-network-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-network\Release static_Win32" />
 				<Option type="2" />
@@ -129,6 +129,8 @@
 		<Unit filename="..\..\src\SFML\Network\Win32\SocketHelper.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-system.cbp b/build/codeblocks/sfml-system.cbp
index c6b5f6225..7e82b659e 100644
--- a/build/codeblocks/sfml-system.cbp
+++ b/build/codeblocks/sfml-system.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-system-d.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-system-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-system\Debug DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -27,7 +27,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-system.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-system" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-system\Release DLL_Win32" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -46,7 +46,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-system-s-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-system-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-system\Debug static_Win32" />
 				<Option type="2" />
@@ -66,7 +66,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-system-s.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-system-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-system\Release static_Win32" />
 				<Option type="2" />
@@ -119,6 +119,8 @@
 		<Unit filename="..\..\src\SFML\System\Win32\Thread.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/build/codeblocks/sfml-window.cbp b/build/codeblocks/sfml-window.cbp
index 2af97df17..922acea68 100644
--- a/build/codeblocks/sfml-window.cbp
+++ b/build/codeblocks/sfml-window.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-window-d.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-window-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-window\Debug DLL_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-d.a;" />
 				<Option type="3" />
@@ -34,7 +34,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release DLL_Win32">
-				<Option output="..\..\lib\mingw\sfml-window.dll" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\sfml-window" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\Temp\sfml-window\Release DLL_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system.a;" />
 				<Option type="3" />
@@ -60,7 +60,7 @@
 				</Linker>
 			</Target>
 			<Target title="Debug static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-window-s-d.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-window-s-d" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-window\Debug static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-s-d.a;" />
@@ -81,7 +81,7 @@
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release static_Win32">
-				<Option output="..\..\lib\mingw\libsfml-window-s.a" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\lib\mingw\libsfml-window-s" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="" />
 				<Option object_output="..\..\Temp\sfml-window\Release static_Win32" />
 				<Option external_deps="..\..\lib\mingw\libsfml-system-s.a;" />
@@ -135,6 +135,8 @@
 		<Unit filename="..\..\src\SFML\Window\WindowImpl.hpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/ftp.cbp b/samples/build/codeblocks/ftp.cbp
index 05ef7b23a..de8996766 100644
--- a/samples/build/codeblocks/ftp.cbp
+++ b/samples/build/codeblocks/ftp.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\ftp-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\ftp-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\ftp\Debug_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -28,7 +28,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\ftp.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\ftp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\ftp\Release_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -54,6 +54,8 @@
 		<Unit filename="..\..\ftp\Ftp.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/opengl.cbp b/samples/build/codeblocks/opengl.cbp
index 46ab5496f..52b67b4f1 100644
--- a/samples/build/codeblocks/opengl.cbp
+++ b/samples/build/codeblocks/opengl.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\opengl-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\opengl-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\opengl\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -33,7 +33,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\opengl.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\opengl" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\opengl\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -64,6 +64,8 @@
 		<Unit filename="..\..\opengl\OpenGL.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/pong.cbp b/samples/build/codeblocks/pong.cbp
index a527d6f11..e73cb7471 100644
--- a/samples/build/codeblocks/pong.cbp
+++ b/samples/build/codeblocks/pong.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\pong-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\pong-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\opengl\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -34,7 +34,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\pong.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\pong" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\opengl\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -66,6 +66,8 @@
 		<Unit filename="..\..\pong\Pong.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/postfx.cbp b/samples/build/codeblocks/postfx.cbp
index 79ade5792..97350db7e 100644
--- a/samples/build/codeblocks/postfx.cbp
+++ b/samples/build/codeblocks/postfx.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\postfx-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\postfx-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\postfx\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -31,7 +31,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\postfx.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\postfx" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\postfx\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -60,6 +60,8 @@
 		<Unit filename="..\..\post-fx\PostFX.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/qt.cbp b/samples/build/codeblocks/qt.cbp
index dd34d5af5..20c6125dc 100644
--- a/samples/build/codeblocks/qt.cbp
+++ b/samples/build/codeblocks/qt.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\qt-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\qt-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\qt\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -44,7 +44,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\qt.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\qt" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\qt\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -89,6 +89,8 @@
 		<Unit filename="..\..\qt\QSFMLCanvas.hpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/sockets.cbp b/samples/build/codeblocks/sockets.cbp
index 7132272ad..8a2c14d3d 100644
--- a/samples/build/codeblocks/sockets.cbp
+++ b/samples/build/codeblocks/sockets.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\sockets-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\sockets-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\sockets\Debug_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -28,7 +28,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\sockets.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\sockets" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\sockets\Release_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -56,6 +56,8 @@
 		<Unit filename="..\..\sockets\UDP.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/sound-capture.cbp b/samples/build/codeblocks/sound-capture.cbp
index f90f1c11b..75212a7ff 100644
--- a/samples/build/codeblocks/sound-capture.cbp
+++ b/samples/build/codeblocks/sound-capture.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\sound-capture-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\sound-capture-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\sound-capture\Debug_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -29,7 +29,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\sound-capture.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\sound-capture" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\sound-capture\Release_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -56,6 +56,8 @@
 		<Unit filename="..\..\sound_capture\SoundCapture.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/sound.cbp b/samples/build/codeblocks/sound.cbp
index 6348d5ed4..c1f922e56 100644
--- a/samples/build/codeblocks/sound.cbp
+++ b/samples/build/codeblocks/sound.cbp
@@ -1,61 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="sound" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug_Win32">
-				<Option output="..\..\bin\sound-d.exe" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\..\Temp\sound\Debug_Win32" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-O0" />
-					<Add option="-DWIN32" />
-					<Add option="-D_DEBUG" />
-					<Add option="-D_WINDOWS" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory="..\..\..\include" />
-					<Add directory="..\..\..\extlibs" />
-				</ResourceCompiler>
-				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
-				</Linker>
-			</Target>
-			<Target title="Release_Win32">
-				<Option output="..\..\bin\sound.exe" prefix_auto="1" extension_auto="1" />
-				<Option object_output="..\..\..\Temp\sound\Release_Win32" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DWIN32" />
-					<Add option="-DNDEBUG" />
-					<Add option="-D_WINDOWS" />
-				</Compiler>
-				<ResourceCompiler>
-					<Add directory="..\..\..\include" />
-					<Add directory="..\..\..\extlibs" />
-				</ResourceCompiler>
-				<Linker>
-					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
-					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add directory="..\..\..\include" />
-		</Compiler>
-		<Unit filename="..\..\sound\Sound.cpp" />
-		<Extensions>
-			<code_completion />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="sound" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug_Win32">
+				<Option output="..\..\bin\sound-d" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\..\Temp\sound\Debug_Win32" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-O0" />
+					<Add option="-DWIN32" />
+					<Add option="-D_DEBUG" />
+					<Add option="-D_WINDOWS" />
+				</Compiler>
+				<ResourceCompiler>
+					<Add directory="..\..\..\include" />
+					<Add directory="..\..\..\extlibs" />
+				</ResourceCompiler>
+				<Linker>
+					<Add library="..\..\..\lib\mingw\libsfml-audio-s-d.a" />
+					<Add library="..\..\..\lib\mingw\libsfml-system-s-d.a" />
+				</Linker>
+			</Target>
+			<Target title="Release_Win32">
+				<Option output="..\..\bin\sound" prefix_auto="1" extension_auto="1" />
+				<Option object_output="..\..\..\Temp\sound\Release_Win32" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DWIN32" />
+					<Add option="-DNDEBUG" />
+					<Add option="-D_WINDOWS" />
+				</Compiler>
+				<ResourceCompiler>
+					<Add directory="..\..\..\include" />
+					<Add directory="..\..\..\extlibs" />
+				</ResourceCompiler>
+				<Linker>
+					<Add library="..\..\..\lib\mingw\libsfml-audio-s.a" />
+					<Add library="..\..\..\lib\mingw\libsfml-system-s.a" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="..\..\..\include" />
+		</Compiler>
+		<Unit filename="..\..\sound\Sound.cpp" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/voip.cbp b/samples/build/codeblocks/voip.cbp
index 49a477b68..44c48c9e6 100644
--- a/samples/build/codeblocks/voip.cbp
+++ b/samples/build/codeblocks/voip.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\voip-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\voip-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\voip\Debug_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -30,7 +30,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\voip.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\voip" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\voip\Release_Win32" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -60,6 +60,8 @@
 		<Unit filename="..\..\voip\VoIP.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/win32.cbp b/samples/build/codeblocks/win32.cbp
index df754293a..3822dda60 100644
--- a/samples/build/codeblocks/win32.cbp
+++ b/samples/build/codeblocks/win32.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\win32-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\win32-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\win32\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -30,7 +30,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\win32.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\win32" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\win32\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -58,6 +58,8 @@
 		<Unit filename="..\..\win32\Win32.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/window.cbp b/samples/build/codeblocks/window.cbp
index 507389dbf..6df54cc7e 100644
--- a/samples/build/codeblocks/window.cbp
+++ b/samples/build/codeblocks/window.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\window-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\window-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\window\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -31,7 +31,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\window.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\window" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\window\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -60,6 +60,8 @@
 		<Unit filename="..\..\window\Window.cpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/samples/build/codeblocks/wxwidgets.cbp b/samples/build/codeblocks/wxwidgets.cbp
index ac561298a..cf9a3080c 100644
--- a/samples/build/codeblocks/wxwidgets.cbp
+++ b/samples/build/codeblocks/wxwidgets.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug_Win32">
-				<Option output="..\..\bin\wxwidgets-d.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\wxwidgets-d" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\wxwidgets\Debug_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -42,7 +42,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release_Win32">
-				<Option output="..\..\bin\wxwidgets.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="..\..\bin\wxwidgets" prefix_auto="1" extension_auto="1" />
 				<Option object_output="..\..\..\Temp\wxwidgets\Release_Win32" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -84,6 +84,8 @@
 		<Unit filename="..\..\wxwidgets\wxSFMLCanvas.hpp" />
 		<Extensions>
 			<code_completion />
+			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>