diff --git a/build/xcode/SFML-bare.xcodeproj/project.pbxproj b/build/xcode/SFML-bare.xcodeproj/project.pbxproj index b9ad2bfb..6eab40f3 100644 --- a/build/xcode/SFML-bare.xcodeproj/project.pbxproj +++ b/build/xcode/SFML-bare.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ A018A2AF0EA21A2C005FFAC3 /* Http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A018A2AD0EA21A2C005FFAC3 /* Http.cpp */; }; A018A2B00EA21A2C005FFAC3 /* Ftp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A018A2AE0EA21A2C005FFAC3 /* Ftp.cpp */; }; A01BEF080F6BF0140095262C /* Initializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A01BEF070F6BF0140095262C /* Initializer.cpp */; }; - A01BEF0C0F6BF0550095262C /* sndfile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A01BEF0B0F6BF0550095262C /* sndfile.framework */; }; A04C5A9D0EDDD88B00935061 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A04C5A940EDDD88B00935061 /* AppController.mm */; }; A04C5A9E0EDDD88B00935061 /* Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04C5A950EDDD88B00935061 /* Joystick.cpp */; }; A04C5A9F0EDDD88B00935061 /* VideoModeSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04C5A970EDDD88B00935061 /* VideoModeSupport.cpp */; }; @@ -158,6 +157,7 @@ A066106A0E89058900D39DEB /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A0660FE90E89058900D39DEB /* trees.c */; }; A066106C0E89058900D39DEB /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A0660FEB0E89058900D39DEB /* uncompr.c */; }; A066106F0E89058900D39DEB /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A0660FEE0E89058900D39DEB /* zutil.c */; }; + A0ABBD570FD46A2200D528E9 /* libsfml-system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A01269660E6318C000B96A5D /* libsfml-system.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -201,15 +201,14 @@ /* Begin PBXFileReference section */ A011E8050F65B35400FAE48D /* GLKit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GLKit.h; sourceTree = ""; }; A011E8060F65B35400FAE48D /* GLKit.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = GLKit.mm; sourceTree = ""; }; - A01269660E6318C000B96A5D /* libsfml-system-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-system-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; - A012696F0E6318FE00B96A5D /* libsfml-network-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-network-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; - A01269760E63190F00B96A5D /* libsfml-audio-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-audio-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; - A012697D0E63192000B96A5D /* libsfml-window-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-window-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; - A01269840E63192B00B96A5D /* libsfml-graphics-d.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-graphics-d.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; + A01269660E6318C000B96A5D /* libsfml-system.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-system.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; + A012696F0E6318FE00B96A5D /* libsfml-network.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-network.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; + A01269760E63190F00B96A5D /* libsfml-audio.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-audio.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; + A012697D0E63192000B96A5D /* libsfml-window.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-window.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; + A01269840E63192B00B96A5D /* libsfml-graphics.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libsfml-graphics.dylib"; sourceTree = BUILT_PRODUCTS_DIR; }; A018A2AD0EA21A2C005FFAC3 /* Http.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Http.cpp; path = ../../src/SFML/Network/Http.cpp; sourceTree = SOURCE_ROOT; }; A018A2AE0EA21A2C005FFAC3 /* Ftp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Ftp.cpp; path = ../../src/SFML/Network/Ftp.cpp; sourceTree = SOURCE_ROOT; }; A01BEF070F6BF0140095262C /* Initializer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Initializer.cpp; path = ../../src/SFML/System/Initializer.cpp; sourceTree = SOURCE_ROOT; }; - A01BEF0B0F6BF0550095262C /* sndfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sndfile.framework; path = "../../extlibs/libs-xcode/sndfile.framework"; sourceTree = SOURCE_ROOT; }; A04C5A930EDDD88B00935061 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ../../src/SFML/Window/Cocoa/AppController.h; sourceTree = SOURCE_ROOT; }; A04C5A940EDDD88B00935061 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ../../src/SFML/Window/Cocoa/AppController.mm; sourceTree = SOURCE_ROOT; }; A04C5A950EDDD88B00935061 /* Joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Joystick.cpp; path = ../../src/SFML/Window/Cocoa/Joystick.cpp; sourceTree = SOURCE_ROOT; }; @@ -410,7 +409,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A01BEF0C0F6BF0550095262C /* sndfile.framework in Frameworks */, + A0ABBD570FD46A2200D528E9 /* libsfml-system.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -446,11 +445,11 @@ A01269670E6318C000B96A5D /* Products */ = { isa = PBXGroup; children = ( - A01269660E6318C000B96A5D /* libsfml-system-d.dylib */, - A012696F0E6318FE00B96A5D /* libsfml-network-d.dylib */, - A01269760E63190F00B96A5D /* libsfml-audio-d.dylib */, - A012697D0E63192000B96A5D /* libsfml-window-d.dylib */, - A01269840E63192B00B96A5D /* libsfml-graphics-d.dylib */, + A01269660E6318C000B96A5D /* libsfml-system.dylib */, + A012696F0E6318FE00B96A5D /* libsfml-network.dylib */, + A01269760E63190F00B96A5D /* libsfml-audio.dylib */, + A012697D0E63192000B96A5D /* libsfml-window.dylib */, + A01269840E63192B00B96A5D /* libsfml-graphics.dylib */, ); name = Products; sourceTree = ""; @@ -488,7 +487,6 @@ A012698D0E63194600B96A5D /* sfml-audio */ = { isa = PBXGroup; children = ( - A01BEF0B0F6BF0550095262C /* sndfile.framework */, A0660EDB0E89054E00D39DEB /* AudioDevice.cpp */, A0660EDC0E89054E00D39DEB /* AudioDevice.hpp */, A0660EDD0E89054E00D39DEB /* AudioResource.cpp */, @@ -772,7 +770,7 @@ ); name = "sfml-system"; productName = "sfml-system"; - productReference = A01269660E6318C000B96A5D /* libsfml-system-d.dylib */; + productReference = A01269660E6318C000B96A5D /* libsfml-system.dylib */; productType = "com.apple.product-type.library.dynamic"; }; A012696E0E6318FE00B96A5D /* sfml-network */ = { @@ -788,7 +786,7 @@ ); name = "sfml-network"; productName = "sfml-network"; - productReference = A012696F0E6318FE00B96A5D /* libsfml-network-d.dylib */; + productReference = A012696F0E6318FE00B96A5D /* libsfml-network.dylib */; productType = "com.apple.product-type.library.dynamic"; }; A01269750E63190F00B96A5D /* sfml-audio */ = { @@ -804,7 +802,7 @@ ); name = "sfml-audio"; productName = "sfml-audio"; - productReference = A01269760E63190F00B96A5D /* libsfml-audio-d.dylib */; + productReference = A01269760E63190F00B96A5D /* libsfml-audio.dylib */; productType = "com.apple.product-type.library.dynamic"; }; A012697C0E63192000B96A5D /* sfml-window */ = { @@ -820,7 +818,7 @@ ); name = "sfml-window"; productName = "sfml-window"; - productReference = A012697D0E63192000B96A5D /* libsfml-window-d.dylib */; + productReference = A012697D0E63192000B96A5D /* libsfml-window.dylib */; productType = "com.apple.product-type.library.dynamic"; }; A01269830E63192B00B96A5D /* sfml-graphics */ = { @@ -836,7 +834,7 @@ ); name = "sfml-graphics"; productName = "sfml-graphics"; - productReference = A01269840E63192B00B96A5D /* libsfml-graphics-d.dylib */; + productReference = A01269840E63192B00B96A5D /* libsfml-graphics.dylib */; productType = "com.apple.product-type.library.dynamic"; }; /* End PBXNativeTarget section */ @@ -1068,16 +1066,17 @@ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/bin"; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)", + "${SRCROOT}/../../src", + "${SRCROOT}/../../include", + "$(SRCROOT)/../../extlibs/headers", ); - HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../extlibs/headers\""; INSTALL_PATH = "@executable_path"; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; OBJROOT = build; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - SYMROOT = ../../lib/xcode; + SYMROOT = ../../lib; }; name = Debug; }; @@ -1088,17 +1087,18 @@ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; COPY_PHASE_STRIP = YES; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/bin"; HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)", + "${SRCROOT}/../../src", + "${SRCROOT}/../../include", + "$(SRCROOT)/../../extlibs/headers", ); - HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../extlibs/headers\""; INSTALL_PATH = "@executable_path"; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; OBJROOT = build; OTHER_CFLAGS = "-DNDEBUG"; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - SYMROOT = ../../lib/xcode; + SYMROOT = ../../lib; }; name = Release; }; @@ -1177,11 +1177,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = lib; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/libs-xcode\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; @@ -1189,7 +1184,8 @@ OTHER_LDFLAGS = ( "-framework", OpenAL, - "-lsfml-system-d", + "-framework", + sndfile, ); PREBINDING = NO; PRODUCT_NAME = "sfml-audio-d"; @@ -1203,17 +1199,13 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = lib; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/libs-xcode\""; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; OTHER_LDFLAGS = ( "-framework", OpenAL, - "-lsfml-system", + "-framework", + sndfile, ); PREBINDING = NO; PRODUCT_NAME = "sfml-audio"; @@ -1277,12 +1269,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/headers\""; OTHER_LDFLAGS = ( "$(SRCROOT)/../../extlibs/libs-xcode/libfreetype.a", "-framework", @@ -1304,12 +1290,6 @@ EXECUTABLE_PREFIX = lib; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../src", - "$(SRCROOT)/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/headers\""; OTHER_LDFLAGS = ( "$(SRCROOT)/../../extlibs/libs-xcode/libfreetype.a", "-framework", diff --git a/build/xcode/SFML.xcodeproj/project.pbxproj b/build/xcode/SFML.xcodeproj/project.pbxproj index 6de9e9c1..a182771c 100644 --- a/build/xcode/SFML.xcodeproj/project.pbxproj +++ b/build/xcode/SFML.xcodeproj/project.pbxproj @@ -56,9 +56,9 @@ A04C59B40EDDBA9C00935061 /* VideoModeSupport.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A04C59AA0EDDBA9C00935061 /* VideoModeSupport.hpp */; }; A04C59B70EDDBA9C00935061 /* WindowImplCocoa.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A04C59AD0EDDBA9C00935061 /* WindowImplCocoa.hpp */; }; A04C59B80EDDBA9C00935061 /* WindowImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A04C59AE0EDDBA9C00935061 /* WindowImplCocoa.mm */; }; - A05EEF700E5CF18F00572B7E /* sfml-window-d.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0C93EB40D9A9CA000B9E0C8 /* sfml-window-d.framework */; }; + A05EEF700E5CF18F00572B7E /* sfml-window.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0C93EB40D9A9CA000B9E0C8 /* sfml-window.framework */; }; A093E3D00D8BF918002236B4 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A093E3CF0D8BF918002236B4 /* dummy.cpp */; }; - A093E5480D8BFEAE002236B4 /* sfml-system-d.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */; }; + A093E5480D8BFEAE002236B4 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system.framework */; }; A09EEBF70D8C19BF00F6C625 /* Platform.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A09EEBED0D8C19BF00F6C625 /* Platform.hpp */; }; A09EEBF80D8C19BF00F6C625 /* Randomizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A09EEBEE0D8C19BF00F6C625 /* Randomizer.cpp */; }; A09EEBF90D8C19BF00F6C625 /* Mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A09EEBF00D8C19BF00F6C625 /* Mutex.cpp */; }; @@ -68,9 +68,8 @@ A09EEBFD0D8C19BF00F6C625 /* Clock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A09EEBF40D8C19BF00F6C625 /* Clock.cpp */; }; A09EEBFE0D8C19BF00F6C625 /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A09EEBF50D8C19BF00F6C625 /* Lock.cpp */; }; A09EEBFF0D8C19BF00F6C625 /* Sleep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A09EEBF60D8C19BF00F6C625 /* Sleep.cpp */; }; - A0B617730F66936F005E0970 /* sndfile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0B617720F66936F005E0970 /* sndfile.framework */; }; - A0BE1A200D917332007D4CAD /* sfml-system-d.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */; }; - A0C93F930D9AA9FA00B9E0C8 /* sfml-system-d.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */; }; + A0BE1A200D917332007D4CAD /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system.framework */; }; + A0C93F930D9AA9FA00B9E0C8 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A093E37F0D8BF87A002236B4 /* sfml-system.framework */; }; A0CE9FE70F46F72500FD00CE /* GLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = A0CE9FE50F46F72500FD00CE /* GLKit.h */; }; A0CE9FE80F46F72500FD00CE /* GLKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = A0CE9FE60F46F72500FD00CE /* GLKit.mm */; }; A0EEDE990F59D49C0023A7F7 /* Initializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A0EEDE980F59D49C0023A7F7 /* Initializer.cpp */; }; @@ -412,14 +411,14 @@ A04C59AE0EDDBA9C00935061 /* WindowImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = WindowImplCocoa.mm; path = ../../src/SFML/Window/Cocoa/WindowImplCocoa.mm; sourceTree = SOURCE_ROOT; }; A093E3750D8BF86E002236B4 /* SFML.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SFML.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A093E3770D8BF86E002236B4 /* SFML-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SFML-Info.plist"; sourceTree = SOURCE_ROOT; }; - A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-system-d.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A093E37F0D8BF87A002236B4 /* sfml-system.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-system.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A093E3800D8BF87A002236B4 /* sfml-system-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sfml-system-Info.plist"; sourceTree = SOURCE_ROOT; }; - A093E3880D8BF885002236B4 /* sfml-network-d.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-network-d.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A093E3880D8BF885002236B4 /* sfml-network.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-network.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A093E3890D8BF885002236B4 /* sfml-network-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sfml-network-Info.plist"; sourceTree = SOURCE_ROOT; }; A093E3920D8BF892002236B4 /* sfml-window-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sfml-window-Info.plist"; sourceTree = SOURCE_ROOT; }; - A093E39A0D8BF89B002236B4 /* sfml-audio-d.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-audio-d.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A093E39A0D8BF89B002236B4 /* sfml-audio.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-audio.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A093E39B0D8BF89B002236B4 /* sfml-audio-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sfml-audio-Info.plist"; sourceTree = SOURCE_ROOT; }; - A093E3A30D8BF8A2002236B4 /* sfml-graphics-d.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-graphics-d.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A093E3A30D8BF8A2002236B4 /* sfml-graphics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-graphics.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A093E3A40D8BF8A2002236B4 /* sfml-graphics-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sfml-graphics-Info.plist"; sourceTree = SOURCE_ROOT; }; A093E3CF0D8BF918002236B4 /* dummy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dummy.cpp; sourceTree = SOURCE_ROOT; }; A09EEBED0D8C19BF00F6C625 /* Platform.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = Platform.hpp; path = ../../src/SFML/System/Platform.hpp; sourceTree = SOURCE_ROOT; }; @@ -431,8 +430,7 @@ A09EEBF40D8C19BF00F6C625 /* Clock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Clock.cpp; path = ../../src/SFML/System/Clock.cpp; sourceTree = SOURCE_ROOT; }; A09EEBF50D8C19BF00F6C625 /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Lock.cpp; path = ../../src/SFML/System/Lock.cpp; sourceTree = SOURCE_ROOT; }; A09EEBF60D8C19BF00F6C625 /* Sleep.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Sleep.cpp; path = ../../src/SFML/System/Sleep.cpp; sourceTree = SOURCE_ROOT; }; - A0B617720F66936F005E0970 /* sndfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sndfile.framework; path = "../../extlibs/libs-xcode/sndfile.framework"; sourceTree = SOURCE_ROOT; }; - A0C93EB40D9A9CA000B9E0C8 /* sfml-window-d.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-window-d.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + A0C93EB40D9A9CA000B9E0C8 /* sfml-window.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "sfml-window.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; A0CE9FE50F46F72500FD00CE /* GLKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLKit.h; sourceTree = ""; }; A0CE9FE60F46F72500FD00CE /* GLKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GLKit.mm; sourceTree = ""; }; A0EEDE980F59D49C0023A7F7 /* Initializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Initializer.cpp; path = ../../src/SFML/System/Initializer.cpp; sourceTree = SOURCE_ROOT; }; @@ -604,8 +602,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A093E5480D8BFEAE002236B4 /* sfml-system-d.framework in Frameworks */, - A0B617730F66936F005E0970 /* sndfile.framework in Frameworks */, + A093E5480D8BFEAE002236B4 /* sfml-system.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -613,8 +610,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A0BE1A200D917332007D4CAD /* sfml-system-d.framework in Frameworks */, - A05EEF700E5CF18F00572B7E /* sfml-window-d.framework in Frameworks */, + A0BE1A200D917332007D4CAD /* sfml-system.framework in Frameworks */, + A05EEF700E5CF18F00572B7E /* sfml-window.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -622,7 +619,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A0C93F930D9AA9FA00B9E0C8 /* sfml-system-d.framework in Frameworks */, + A0C93F930D9AA9FA00B9E0C8 /* sfml-system.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -851,11 +848,11 @@ isa = PBXGroup; children = ( A093E3750D8BF86E002236B4 /* SFML.framework */, - A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */, - A093E3880D8BF885002236B4 /* sfml-network-d.framework */, - A093E39A0D8BF89B002236B4 /* sfml-audio-d.framework */, - A093E3A30D8BF8A2002236B4 /* sfml-graphics-d.framework */, - A0C93EB40D9A9CA000B9E0C8 /* sfml-window-d.framework */, + A093E37F0D8BF87A002236B4 /* sfml-system.framework */, + A093E3880D8BF885002236B4 /* sfml-network.framework */, + A093E39A0D8BF89B002236B4 /* sfml-audio.framework */, + A093E3A30D8BF8A2002236B4 /* sfml-graphics.framework */, + A0C93EB40D9A9CA000B9E0C8 /* sfml-window.framework */, ); name = Products; sourceTree = ""; @@ -900,7 +897,6 @@ A093E3B90D8BF8C2002236B4 /* sfml-audio */ = { isa = PBXGroup; children = ( - A0B617720F66936F005E0970 /* sndfile.framework */, A01A3AD70E75181300D0BA9B /* Sources */, A093E39B0D8BF89B002236B4 /* sfml-audio-Info.plist */, ); @@ -1297,7 +1293,7 @@ ); name = "sfml-system"; productName = "sfml-system"; - productReference = A093E37F0D8BF87A002236B4 /* sfml-system-d.framework */; + productReference = A093E37F0D8BF87A002236B4 /* sfml-system.framework */; productType = "com.apple.product-type.framework"; }; A093E3870D8BF885002236B4 /* sfml-network */ = { @@ -1316,7 +1312,7 @@ ); name = "sfml-network"; productName = "sfml-network"; - productReference = A093E3880D8BF885002236B4 /* sfml-network-d.framework */; + productReference = A093E3880D8BF885002236B4 /* sfml-network.framework */; productType = "com.apple.product-type.framework"; }; A093E3990D8BF89B002236B4 /* sfml-audio */ = { @@ -1335,7 +1331,7 @@ ); name = "sfml-audio"; productName = "sfml-audio"; - productReference = A093E39A0D8BF89B002236B4 /* sfml-audio-d.framework */; + productReference = A093E39A0D8BF89B002236B4 /* sfml-audio.framework */; productType = "com.apple.product-type.framework"; }; A093E3A20D8BF8A2002236B4 /* sfml-graphics */ = { @@ -1355,7 +1351,7 @@ ); name = "sfml-graphics"; productName = "sfml-graphics"; - productReference = A093E3A30D8BF8A2002236B4 /* sfml-graphics-d.framework */; + productReference = A093E3A30D8BF8A2002236B4 /* sfml-graphics.framework */; productType = "com.apple.product-type.framework"; }; A0C93EB30D9A9CA000B9E0C8 /* sfml-window */ = { @@ -1374,7 +1370,7 @@ ); name = "sfml-window"; productName = "sfml-window"; - productReference = A0C93EB40D9A9CA000B9E0C8 /* sfml-window-d.framework */; + productReference = A0C93EB40D9A9CA000B9E0C8 /* sfml-window.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1706,6 +1702,7 @@ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/bin"; GCC_OPTIMIZATION_LEVEL = 0; GCC_VERSION = ""; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; @@ -1718,6 +1715,12 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "${SRCROOT}/../../src", + "${SRCROOT}/../../include", + "$(SRCROOT)/../../extlibs/headers", + ); + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; OBJROOT = build; OTHER_CFLAGS = ""; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; @@ -1733,6 +1736,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/bin"; GCC_OPTIMIZATION_LEVEL = 2; GCC_VERSION = ""; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; @@ -1742,6 +1746,12 @@ GCC_WARN_SHADOW = NO; GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_VARIABLE = NO; + HEADER_SEARCH_PATHS = ( + "${SRCROOT}/../../src", + "${SRCROOT}/../../include", + "$(SRCROOT)/../../extlibs/headers", + ); + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; OBJROOT = build; OTHER_CFLAGS = ""; OTHER_CPLUSPLUSFLAGS = ( @@ -1797,10 +1807,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../src", - "${SRCROOT}/../include", - ); INFOPLIST_FILE = "SFML-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -1826,10 +1832,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../src", - "${SRCROOT}/../include", - ); INFOPLIST_FILE = "SFML-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -1852,21 +1854,17 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(SRCROOT)/../../extlibs/headers", - ); INFOPLIST_FILE = "sfml-audio-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-framework", OpenAL, + "-framework", + sndfile, ); PRODUCT_NAME = "sfml-audio-d"; SECTORDER_FLAGS = ""; @@ -1884,20 +1882,16 @@ COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(SRCROOT)/../../extlibs/headers", - ); INFOPLIST_FILE = "sfml-audio-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ( "-framework", OpenAL, + "-framework", + sndfile, ); PRODUCT_NAME = "sfml-audio"; SECTORDER_FLAGS = ""; @@ -1918,12 +1912,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/headers\""; INFOPLIST_FILE = "sfml-graphics-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -1952,12 +1940,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/headers\""; INFOPLIST_FILE = "sfml-graphics-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -1986,10 +1968,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-network-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2014,10 +1992,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-network-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2042,10 +2016,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-system-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2073,10 +2043,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-system-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2104,10 +2070,6 @@ FRAMEWORK_VERSION = A; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 2; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../include", - "${SRCROOT}/../../src", - ); INFOPLIST_FILE = "sfml-window-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2140,10 +2102,6 @@ FRAMEWORK_VERSION = A; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 2; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../include", - "${SRCROOT}/../../src", - ); INFOPLIST_FILE = "sfml-window-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2173,6 +2131,7 @@ ARCHS = "$(NATIVE_ARCH)"; CONFIGURATION_BUILD_DIR = ../../lib; COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/bin"; GCC_DEBUGGING_SYMBOLS = full; GCC_OPTIMIZATION_LEVEL = 0; GCC_VERSION = ""; @@ -2190,6 +2149,13 @@ GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "${SRCROOT}/../../src", + "${SRCROOT}/../../include", + "$(SRCROOT)/../../extlibs/headers", + ); + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; + OBJROOT = build; OTHER_CFLAGS = "-g3"; SDKROOT = ""; STRIP_INSTALLED_PRODUCT = NO; @@ -2223,10 +2189,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../src", - "${SRCROOT}/../include", - ); INFOPLIST_FILE = "SFML-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2248,21 +2210,17 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(SRCROOT)/../../extlibs/headers", - ); INFOPLIST_FILE = "sfml-audio-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-framework", OpenAL, + "-framework", + sndfile, ); PRODUCT_NAME = "sfml-audio-d"; SECTORDER_FLAGS = ""; @@ -2283,12 +2241,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/headers\""; INFOPLIST_FILE = "sfml-graphics-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2317,10 +2269,6 @@ FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-network-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2346,10 +2294,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../src", - "${SRCROOT}/../../include", - ); INFOPLIST_FILE = "sfml-system-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = ""; @@ -2377,10 +2321,6 @@ FRAMEWORK_VERSION = A; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 2; - HEADER_SEARCH_PATHS = ( - "${SRCROOT}/../../include", - "${SRCROOT}/../../src", - ); INFOPLIST_FILE = "sfml-window-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_CFLAGS = "";