From dafa8624817ebd996dfa8ff48759e4a2e15243c6 Mon Sep 17 00:00:00 2001 From: ceylo Date: Tue, 28 Apr 2009 18:45:10 +0000 Subject: [PATCH] Added support for custom OpenAL framework. Removed sndfile.framework copy file build phase. git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1079 4e206d99-4929-0410-ac5d-dfc041789085 --- build/xcode/SFML.xcodeproj/project.pbxproj | 82 +++++++--------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/build/xcode/SFML.xcodeproj/project.pbxproj b/build/xcode/SFML.xcodeproj/project.pbxproj index 95fcf3f3e..aa058f2f2 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 */; }; @@ -69,9 +69,8 @@ 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 */; }; - A0B617780F66938D005E0970 /* sndfile.framework in CopyFiles */ = {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 */; }; @@ -309,19 +308,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - A0B617500F66926C005E0970 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - A0B617780F66938D005E0970 /* sndfile.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ A018A2790EA21866005FFAC3 /* Http.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Http.cpp; path = ../../src/SFML/Network/Http.cpp; sourceTree = SOURCE_ROOT; }; A018A27A0EA21866005FFAC3 /* Ftp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Ftp.cpp; path = ../../src/SFML/Network/Ftp.cpp; sourceTree = SOURCE_ROOT; }; @@ -426,14 +412,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; }; @@ -446,7 +432,7 @@ 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; }; @@ -618,7 +604,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A093E5480D8BFEAE002236B4 /* sfml-system-d.framework in Frameworks */, + A093E5480D8BFEAE002236B4 /* sfml-system.framework in Frameworks */, A0B617730F66936F005E0970 /* sndfile.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -627,8 +613,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; }; @@ -636,7 +622,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A0C93F930D9AA9FA00B9E0C8 /* sfml-system-d.framework in Frameworks */, + A0C93F930D9AA9FA00B9E0C8 /* sfml-system.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -865,11 +851,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 = ""; @@ -1311,7 +1297,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 */ = { @@ -1330,7 +1316,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 */ = { @@ -1341,7 +1327,6 @@ A093E3960D8BF89B002236B4 /* Resources */, A093E3970D8BF89B002236B4 /* Sources */, A093E3980D8BF89B002236B4 /* Frameworks */, - A0B617500F66926C005E0970 /* CopyFiles */, ); buildRules = ( ); @@ -1350,7 +1335,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 */ = { @@ -1370,7 +1355,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 */ = { @@ -1389,7 +1374,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 */ @@ -1867,11 +1852,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/libs-xcode\""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; @@ -1887,7 +1868,6 @@ "-framework", OpenAL, ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = "sfml-audio-d"; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -1904,11 +1884,7 @@ COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/libs-xcode\""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; @@ -1923,7 +1899,6 @@ "-framework", OpenAL, ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = "sfml-audio"; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -2273,11 +2248,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../extlibs/libs-xcode\""; + FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../../extlibs/libs-xcode"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; @@ -2293,7 +2264,6 @@ "-framework", OpenAL, ); - OTHER_REZFLAGS = ""; PRODUCT_NAME = "sfml-audio-d"; SECTORDER_FLAGS = ""; WARNING_CFLAGS = (