Merged and updated OS X build files (PPC + Intel).

git-svn-id: http://svn.xiph.org/trunk/ogg@11269 0101bb08-14d6-0310-b084-bc0e0c8e3800

1 files changed, 72 insertions, 21 deletions

diff --git a/macosx/Ogg.xcodeproj/project.pbxproj b/macosx/Ogg.xcodeproj/project.pbxproj
index b9cee4f..73e50f4 100644
--- a/macosx/Ogg.xcodeproj/project.pbxproj
+++ b/macosx/Ogg.xcodeproj/project.pbxproj
@@ -242,13 +242,10 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Frameworks;
-				LIBRARY_STYLE = DYNAMIC;
-				MACH_O_TYPE = mh_dylib;
 				PRODUCT_NAME = Ogg;
 				WRAPPER_EXTENSION = framework;
 				ZERO_LINK = YES;
@@ -268,52 +265,104 @@
 				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Frameworks;
-				LIBRARY_STYLE = DYNAMIC;
-				MACH_O_TYPE = mh_dylib;
 				PRODUCT_NAME = Ogg;
 				WRAPPER_EXTENSION = framework;
 				ZERO_LINK = NO;
 			};
 			name = Deployment;
 		};
-		730F235709181A3A00AB638C /* Default */ = {
+		730F235909181A3A00AB638C /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Development;
+		};
+		730F235A09181A3A00AB638C /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				OTHER_CFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-ffast-math",
+					"-falign-loops=16",
+				);
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Deployment;
+		};
+		733D19C409FD6025009384C9 /* Development UB */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Frameworks;
-				LIBRARY_STYLE = DYNAMIC;
-				MACH_O_TYPE = mh_dylib;
 				PRODUCT_NAME = Ogg;
 				WRAPPER_EXTENSION = framework;
+				ZERO_LINK = YES;
 			};
-			name = Default;
+			name = "Development UB";
 		};
-		730F235909181A3A00AB638C /* Development */ = {
+		733D19C509FD6025009384C9 /* Deployment non-UB */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				COPY_PHASE_STRIP = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_VERSION = A;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = Ogg_Prefix.pch;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = /Library/Frameworks;
+				PRODUCT_NAME = Ogg;
+				WRAPPER_EXTENSION = framework;
+				ZERO_LINK = NO;
 			};
-			name = Development;
+			name = "Deployment non-UB";
 		};
-		730F235A09181A3A00AB638C /* Deployment */ = {
+		733D19C609FD6025009384C9 /* Development UB */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
-			name = Deployment;
+			name = "Development UB";
 		};
-		730F235B09181A3A00AB638C /* Default */ = {
+		733D19C709FD6025009384C9 /* Deployment non-UB */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
+				OTHER_CFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-ffast-math",
+					"-falign-loops=16",
+				);
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
-			name = Default;
+			name = "Deployment non-UB";
 		};
 /* End XCBuildConfiguration section */
 
@@ -322,21 +371,23 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				730F235509181A3A00AB638C /* Development */,
+				733D19C409FD6025009384C9 /* Development UB */,
 				730F235609181A3A00AB638C /* Deployment */,
-				730F235709181A3A00AB638C /* Default */,
+				733D19C509FD6025009384C9 /* Deployment non-UB */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
+			defaultConfigurationName = Deployment;
 		};
 		730F235809181A3A00AB638C /* Build configuration list for PBXProject "Ogg" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				730F235909181A3A00AB638C /* Development */,
+				733D19C609FD6025009384C9 /* Development UB */,
 				730F235A09181A3A00AB638C /* Deployment */,
-				730F235B09181A3A00AB638C /* Default */,
+				733D19C709FD6025009384C9 /* Deployment non-UB */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
+			defaultConfigurationName = Deployment;
 		};
 /* End XCConfigurationList section */
 	};