Add build-specific defines to os_types.h for the ProjectBuilder stuff. As

near as I can tell ProjectBuilder doesn't actually define __MACOS__ or
__COCOA__ or __PROJECTBUILDER__ or any other obvious thing. This config
actually passes -D__MACOSX__ on the gcc cmd line and switches off that.

The ogg framework should now build 'out of the box'.


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

1 files changed, 1 insertions, 79 deletions

diff --git a/macosx/ogg.pbproj/project.pbxproj b/macosx/ogg.pbproj/project.pbxproj
index 112680b..7ebe468 100644
--- a/macosx/ogg.pbproj/project.pbxproj
+++ b/macosx/ogg.pbproj/project.pbxproj
@@ -114,7 +114,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = "$(HOME)/Library/Frameworks";
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "";
+				OTHER_CFLAGS = "-D__MACOSX__";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = ogg;
 				SECTORDER_FLAGS = "";
@@ -160,7 +160,6 @@
 			files = (
 				F5825565019164DF01A802FE,
 				F586EB5C0191DDEA01A802FE,
-				F586EB5D0191DDEA01A802FE,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -291,36 +290,13 @@
 			children = (
 				F58255530191644401A802FE,
 				F58255540191644401A802FE,
-				F58255500191644401A802FE,
-				F58255550191644401A802FE,
-				F58255560191644401A802FE,
 				F58255570191644401A802FE,
-				F58255580191644401A802FE,
 			);
 			isa = PBXGroup;
 			name = src;
 			path = ../src;
 			refType = 2;
 		};
-		F58255500191644401A802FE = {
-			children = (
-				F58255510191644401A802FE,
-				F58255520191644401A802FE,
-			);
-			isa = PBXGroup;
-			path = .deps;
-			refType = 4;
-		};
-		F58255510191644401A802FE = {
-			isa = PBXFileReference;
-			path = bitwise.Plo;
-			refType = 4;
-		};
-		F58255520191644401A802FE = {
-			isa = PBXFileReference;
-			path = framing.Plo;
-			refType = 4;
-		};
 		F58255530191644401A802FE = {
 			isa = PBXFileReference;
 			path = bitwise.c;
@@ -331,26 +307,11 @@
 			path = framing.c;
 			refType = 4;
 		};
-		F58255550191644401A802FE = {
-			isa = PBXFileReference;
-			path = libogg.la;
-			refType = 4;
-		};
-		F58255560191644401A802FE = {
-			isa = PBXFileReference;
-			path = Makefile;
-			refType = 4;
-		};
 		F58255570191644401A802FE = {
 			isa = PBXFileReference;
 			path = Makefile.am;
 			refType = 4;
 		};
-		F58255580191644401A802FE = {
-			isa = PBXFileReference;
-			path = Makefile.in;
-			refType = 4;
-		};
 		F582555A0191644401A802FE = {
 			fileRef = F58255530191644401A802FE;
 			isa = PBXBuildFile;
@@ -366,23 +327,13 @@
 		F582555C019164DF01A802FE = {
 			children = (
 				F582555E019164DF01A802FE,
-				F582555D019164DF01A802FE,
 				F582555F019164DF01A802FE,
-				F5825560019164DF01A802FE,
-				F5825561019164DF01A802FE,
-				F5825562019164DF01A802FE,
-				F5825563019164DF01A802FE,
 			);
 			isa = PBXGroup;
 			name = Headers;
 			path = ../include/ogg;
 			refType = 2;
 		};
-		F582555D019164DF01A802FE = {
-			isa = PBXFileReference;
-			path = config_types.h;
-			refType = 4;
-		};
 		F582555E019164DF01A802FE = {
 			isa = PBXFileReference;
 			path = ogg.h;
@@ -393,26 +344,6 @@
 			path = os_types.h;
 			refType = 4;
 		};
-		F5825560019164DF01A802FE = {
-			isa = PBXFileReference;
-			path = config_types.h.in;
-			refType = 4;
-		};
-		F5825561019164DF01A802FE = {
-			isa = PBXFileReference;
-			path = Makefile;
-			refType = 4;
-		};
-		F5825562019164DF01A802FE = {
-			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
-		};
-		F5825563019164DF01A802FE = {
-			isa = PBXFileReference;
-			path = Makefile.in;
-			refType = 4;
-		};
 		F5825565019164DF01A802FE = {
 			fileRef = F582555E019164DF01A802FE;
 			isa = PBXBuildFile;
@@ -431,15 +362,6 @@
 				);
 			};
 		};
-		F586EB5D0191DDEA01A802FE = {
-			fileRef = F582555D019164DF01A802FE;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-					Public,
-				);
-			};
-		};
 	};
 	rootObject = 0867D690FE84028FC02AAC07;
 }