[xiph-cvs] cvs commit: ogg/macosx/ogg.pbproj project.pbxproj
Ralph Giles
giles at xiph.org
Thu Nov 1 23:39:13 PST 2001
giles 01/11/01 23:39:13
Modified: include/ogg os_types.h
macosx/ogg.pbproj project.pbxproj
Log:
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'.
Revision Changes Path
1.8 +10 -2 ogg/include/ogg/os_types.h
Index: os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- os_types.h 2001/06/03 03:09:18 1.7
+++ os_types.h 2001/11/02 07:39:12 1.8
@@ -11,7 +11,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h,v 1.7 2001/06/03 03:09:18 xiphmont Exp $
+ last mod: $Id: os_types.h,v 1.8 2001/11/02 07:39:12 giles Exp $
********************************************************************/
#ifndef _OS_TYPES_H
@@ -41,13 +41,21 @@
typedef _G_int16_t ogg_int16_t;
# endif
-#elif defined(macintosh)
+#elif defined(__MACOS__)
# include <sys/types.h>
typedef SInt16 ogg_int16_t;
typedef SInt32 ogg_int32_t;
typedef UInt32 ogg_uint32_t;
typedef SInt64 ogg_int64_t;
+
+#elif defined(__MACOSX__) /* MacOS X Framework build */
+
+# include <sys/types.h>
+ typedef int16_t ogg_int16_t;
+ typedef int32_t ogg_int32_t;
+ typedef u_int32_t ogg_uint32_t;
+ typedef int64_t ogg_int64_t;
#elif defined(__BEOS__)
1.2 +1 -79 ogg/macosx/ogg.pbproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /usr/local/cvsroot/ogg/macosx/ogg.pbproj/project.pbxproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.pbxproj 2001/11/02 06:06:12 1.1
+++ project.pbxproj 2001/11/02 07:39:13 1.2
@@ -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;
@@ -424,15 +355,6 @@
};
F586EB5C0191DDEA01A802FE = {
fileRef = F582555F019164DF01A802FE;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- F586EB5D0191DDEA01A802FE = {
- fileRef = F582555D019164DF01A802FE;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list