diff --git a/CSFML/xcode/SFML-bare.xcodeproj/project.pbxproj b/CSFML/xcode/SFML-bare.xcodeproj/project.pbxproj
index 506c8f80e..9b92bb679 100644
--- a/CSFML/xcode/SFML-bare.xcodeproj/project.pbxproj
+++ b/CSFML/xcode/SFML-bare.xcodeproj/project.pbxproj
@@ -245,10 +245,10 @@
 		A011E5E70F65786600FAE48D /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = A011E5660F65786600FAE48D /* zlib.h */; };
 		A011E5E80F65786600FAE48D /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A011E5670F65786600FAE48D /* zutil.c */; };
 		A011E5E90F65786600FAE48D /* zutil.h in Headers */ = {isa = PBXBuildFile; fileRef = A011E5680F65786600FAE48D /* zutil.h */; };
-		A011E5FB0F65791B00FAE48D /* libcsfml-system-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */; };
-		A011E6060F65797100FAE48D /* libcsfml-system-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */; };
-		A011E6140F6579CA00FAE48D /* libcsfml-window-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E38F0F6574B500FAE48D /* libcsfml-window-d.dylib */; };
-		A011E6170F6579D100FAE48D /* libcsfml-system-d.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */; };
+		A011E5FB0F65791B00FAE48D /* libcsfml-system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system.dylib */; };
+		A011E6060F65797100FAE48D /* libcsfml-system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system.dylib */; };
+		A011E6140F6579CA00FAE48D /* libcsfml-window.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E38F0F6574B500FAE48D /* libcsfml-window.dylib */; };
+		A011E6170F6579D100FAE48D /* libcsfml-system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A011E3720F65749300FAE48D /* libcsfml-system.dylib */; };
 		A01BEF370F6BF2490095262C /* sndfile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A01BEF360F6BF2490095262C /* sndfile.framework */; };
 /* End PBXBuildFile section */
 
@@ -291,11 +291,11 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-system-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A011E37D0F65749F00FAE48D /* libcsfml-network-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-network-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A011E3860F6574AC00FAE48D /* libcsfml-audio-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-audio-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A011E38F0F6574B500FAE48D /* libcsfml-window-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-window-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A011E3980F6574BE00FAE48D /* libcsfml-graphics-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-graphics-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A011E3720F65749300FAE48D /* libcsfml-system.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-system.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A011E37D0F65749F00FAE48D /* libcsfml-network.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-network.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A011E3860F6574AC00FAE48D /* libcsfml-audio.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-audio.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A011E38F0F6574B500FAE48D /* libcsfml-window.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-window.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A011E3980F6574BE00FAE48D /* libcsfml-graphics.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libcsfml-graphics.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A011E3A40F6574E400FAE48D /* SFML-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SFML-Info.plist"; sourceTree = "<group>"; };
 		A011E3DE0F65776B00FAE48D /* Sleep.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Sleep.cpp; path = ../src/SFML/System/Sleep.cpp; sourceTree = SOURCE_ROOT; };
 		A011E3DF0F65776B00FAE48D /* Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Thread.cpp; path = ../src/SFML/System/Thread.cpp; sourceTree = SOURCE_ROOT; };
@@ -539,7 +539,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A011E5FB0F65791B00FAE48D /* libcsfml-system-d.dylib in Frameworks */,
+				A011E5FB0F65791B00FAE48D /* libcsfml-system.dylib in Frameworks */,
 				A01BEF370F6BF2490095262C /* sndfile.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -548,7 +548,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A011E6060F65797100FAE48D /* libcsfml-system-d.dylib in Frameworks */,
+				A011E6060F65797100FAE48D /* libcsfml-system.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -556,8 +556,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A011E6140F6579CA00FAE48D /* libcsfml-window-d.dylib in Frameworks */,
-				A011E6170F6579D100FAE48D /* libcsfml-system-d.dylib in Frameworks */,
+				A011E6140F6579CA00FAE48D /* libcsfml-window.dylib in Frameworks */,
+				A011E6170F6579D100FAE48D /* libcsfml-system.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -567,7 +567,6 @@
 		A011E3550F65738800FAE48D = {
 			isa = PBXGroup;
 			children = (
-				A011E3C10F6575B300FAE48D /* SFML */,
 				A011E3C80F6575D800FAE48D /* csfml-system */,
 				A011E3C70F6575D000FAE48D /* csfml-network */,
 				A011E3C40F6575C100FAE48D /* csfml-audio */,
@@ -581,22 +580,15 @@
 		A011E3730F65749300FAE48D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */,
-				A011E37D0F65749F00FAE48D /* libcsfml-network-d.dylib */,
-				A011E3860F6574AC00FAE48D /* libcsfml-audio-d.dylib */,
-				A011E38F0F6574B500FAE48D /* libcsfml-window-d.dylib */,
-				A011E3980F6574BE00FAE48D /* libcsfml-graphics-d.dylib */,
+				A011E3720F65749300FAE48D /* libcsfml-system.dylib */,
+				A011E37D0F65749F00FAE48D /* libcsfml-network.dylib */,
+				A011E3860F6574AC00FAE48D /* libcsfml-audio.dylib */,
+				A011E38F0F6574B500FAE48D /* libcsfml-window.dylib */,
+				A011E3980F6574BE00FAE48D /* libcsfml-graphics.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		A011E3C10F6575B300FAE48D /* SFML */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = SFML;
-			sourceTree = "<group>";
-		};
 		A011E3C20F6575B700FAE48D /* csfml-graphics */ = {
 			isa = PBXGroup;
 			children = (
@@ -1088,7 +1080,7 @@
 			);
 			name = "csfml-system";
 			productName = "csfml-system";
-			productReference = A011E3720F65749300FAE48D /* libcsfml-system-d.dylib */;
+			productReference = A011E3720F65749300FAE48D /* libcsfml-system.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		A011E37C0F65749F00FAE48D /* csfml-network */ = {
@@ -1105,7 +1097,7 @@
 			);
 			name = "csfml-network";
 			productName = "csfml-network";
-			productReference = A011E37D0F65749F00FAE48D /* libcsfml-network-d.dylib */;
+			productReference = A011E37D0F65749F00FAE48D /* libcsfml-network.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		A011E3850F6574AC00FAE48D /* csfml-audio */ = {
@@ -1122,7 +1114,7 @@
 			);
 			name = "csfml-audio";
 			productName = "csfml-audio";
-			productReference = A011E3860F6574AC00FAE48D /* libcsfml-audio-d.dylib */;
+			productReference = A011E3860F6574AC00FAE48D /* libcsfml-audio.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		A011E38E0F6574B500FAE48D /* csfml-window */ = {
@@ -1139,7 +1131,7 @@
 			);
 			name = "csfml-window";
 			productName = "csfml-window";
-			productReference = A011E38F0F6574B500FAE48D /* libcsfml-window-d.dylib */;
+			productReference = A011E38F0F6574B500FAE48D /* libcsfml-window.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		A011E3970F6574BE00FAE48D /* csfml-graphics */ = {
@@ -1156,7 +1148,7 @@
 			);
 			name = "csfml-graphics";
 			productName = "csfml-graphics";
-			productReference = A011E3980F6574BE00FAE48D /* libcsfml-graphics-d.dylib */;
+			productReference = A011E3980F6574BE00FAE48D /* libcsfml-graphics.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 /* End PBXNativeTarget section */
@@ -1422,6 +1414,7 @@
 				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib";
 				COPY_PHASE_STRIP = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = CSFML_EXPORTS;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
@@ -1457,6 +1450,7 @@
 				CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib";
 				COPY_PHASE_STRIP = YES;
 				GCC_OPTIMIZATION_LEVEL = 2;
+				GCC_PREPROCESSOR_DEFINITIONS = CSFML_EXPORTS;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../src",
 					"$(SRCROOT)/../include",