[xiph-commits] r11331 - in trunk/xiph-qt: CAFLAC/CAFLAC.xcodeproj CASpeex/CASpeex.xcodeproj CAVorbis/CAVorbis.xcodeproj OggImport/OggImport.xcodeproj OggImport/src Theora/Theora.xcodeproj

arek at svn.xiph.org arek at svn.xiph.org
Mon May 1 11:06:17 PDT 2006


Author: arek
Date: 2006-05-01 11:05:57 -0700 (Mon, 01 May 2006)
New Revision: 11331

Modified:
   trunk/xiph-qt/CAFLAC/CAFLAC.xcodeproj/project.pbxproj
   trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj
   trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj
   trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj
   trunk/xiph-qt/OggImport/src/common.h
   trunk/xiph-qt/Theora/Theora.xcodeproj/project.pbxproj
Log:
More OS X build system fixes.

Modified: trunk/xiph-qt/CAFLAC/CAFLAC.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/CAFLAC/CAFLAC.xcodeproj/project.pbxproj	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/CAFLAC/CAFLAC.xcodeproj/project.pbxproj	2006-05-01 18:05:57 UTC (rev 11331)
@@ -488,6 +488,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -513,7 +517,7 @@
 				739EAEA908FEB331008D8013 /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 		739EAEAB08FEB331008D8013 /* Build configuration list for PBXProject "CAFLAC" */ = {
 			isa = XCConfigurationList;
@@ -522,7 +526,7 @@
 				739EAEAD08FEB331008D8013 /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 /* End XCConfigurationList section */
 	};

Modified: trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj	2006-05-01 18:05:57 UTC (rev 11331)
@@ -483,10 +483,6 @@
 		73814AA50907F9EC00C478FC /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -530,7 +526,7 @@
 				73814AA20907F9EC00C478FC /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 		73814AA40907F9EC00C478FC /* Build configuration list for PBXProject "CASpeex" */ = {
 			isa = XCConfigurationList;
@@ -539,7 +535,7 @@
 				73814AA60907F9EC00C478FC /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 /* End XCConfigurationList section */
 	};

Modified: trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj	2006-05-01 18:05:57 UTC (rev 11331)
@@ -433,10 +433,6 @@
 		737810D108FCC24B00686713 /* Deployment (optimized+) */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				COPY_PHASE_STRIP = YES;
 				EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -486,10 +482,6 @@
 		737C9E9908F7FE4D00DAC36C /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				COPY_PHASE_STRIP = NO;
 				EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -514,10 +506,6 @@
 		737C9E9A08F7FE4D00DAC36C /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				COPY_PHASE_STRIP = YES;
 				EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -543,10 +531,6 @@
 		737C9E9D08F7FE4D00DAC36C /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -593,7 +577,7 @@
 				737810D108FCC24B00686713 /* Deployment (optimized+) */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 		737C9E9C08F7FE4D00DAC36C /* Build configuration list for PBXProject "CAVorbis" */ = {
 			isa = XCConfigurationList;
@@ -603,7 +587,7 @@
 				737810D208FCC24B00686713 /* Deployment (optimized+) */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 /* End XCConfigurationList section */
 	};

Modified: trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj	2006-05-01 18:05:57 UTC (rev 11331)
@@ -369,10 +369,6 @@
 		73182D57090AAD7600C25A13 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				COPY_PHASE_STRIP = NO;
 				EXPORTED_SYMBOLS_FILE = src/OggImport.exp;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -447,6 +443,10 @@
 		73182D5C090AAD7600C25A13 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -467,7 +467,7 @@
 				73182D58090AAD7600C25A13 /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 		73182D5A090AAD7600C25A13 /* Build configuration list for PBXProject "OggImport" */ = {
 			isa = XCConfigurationList;
@@ -476,7 +476,7 @@
 				73182D5C090AAD7600C25A13 /* Deployment */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
+			defaultConfigurationName = Deployment;
 		};
 /* End XCConfigurationList section */
 	};

Modified: trunk/xiph-qt/OggImport/src/common.h
===================================================================
--- trunk/xiph-qt/OggImport/src/common.h	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/OggImport/src/common.h	2006-05-01 18:05:57 UTC (rev 11331)
@@ -29,7 +29,8 @@
     #include <Math64.h>
 #endif
 
-#include "vorbis/codec.h"
+#include <Ogg/ogg.h>
+#include <Vorbis/codec.h>
 
 
 Boolean FindPage(unsigned char **data, const unsigned char *end, ogg_page *og);

Modified: trunk/xiph-qt/Theora/Theora.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/Theora/Theora.xcodeproj/project.pbxproj	2006-05-01 07:28:50 UTC (rev 11330)
+++ trunk/xiph-qt/Theora/Theora.xcodeproj/project.pbxproj	2006-05-01 18:05:57 UTC (rev 11331)
@@ -262,10 +262,6 @@
 		4FADC23508B4156C00ABE55E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				EXPORTED_SYMBOLS_FILE = src/Theora.exp;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
@@ -303,6 +299,10 @@
 		4FADC23908B4156C00ABE55E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(FRAMEWORK_SEARCH_PATHS)",
 					"$(LOCAL_LIBRARY_DIR)/Frameworks",



More information about the commits mailing list