other/libotr 485:c7939ac6314a: Making the libotr.xcodeproj 3.1-c...
commits at adium.im
commits at adium.im
Sun Sep 6 16:52:40 UTC 2009
details: http://hg.adium.im/other/libotr/rev/c7939ac6314a
revision: 485:c7939ac6314a
author: Stephen Holt <sholt at adium.im>
date: Sun Sep 06 12:55:01 2009 -0400
Making the libotr.xcodeproj 3.1-compat, and upping the target and SDK to 10.5. Also, adding some additional type defines for x86_64.
diffs (176 lines):
diff -r 4440c29cbed8 -r c7939ac6314a Libotr.xcodeproj/project.pbxproj
--- a/Libotr.xcodeproj/project.pbxproj Tue Aug 25 12:05:57 2009 -0400
+++ b/Libotr.xcodeproj/project.pbxproj Sun Sep 06 12:55:01 2009 -0400
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXAggregateTarget section */
@@ -625,7 +625,7 @@
34F43FFA07ADFADD00909E99 /* userstate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = userstate.h; path = Libraries/libotr/src/userstate.h; sourceTree = "<group>"; };
34F43FFF07ADFADD00909E99 /* userstate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = userstate.c; path = Libraries/libotr/src/userstate.c; sourceTree = "<group>"; };
34F4412207ADFBE400909E99 /* Kerberos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kerberos.framework; path = /Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks/Kerberos.framework; sourceTree = "<absolute>"; };
- 34F520DB0CC6FDEC008D9135 /* libdes425.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdes425.dylib; path = SDKs/MacOSX10.4u.sdk/usr/lib/libdes425.dylib; sourceTree = SYSTEM_DEVELOPER_DIR; };
+ 34F520DB0CC6FDEC008D9135 /* libdes425.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdes425.dylib; path = SDKs/MacOSX10.4u.sdk/usr/lib/libdes425.dylib; sourceTree = DEVELOPER_DIR; };
34FC919807C5C45F00F531C0 /* gstdio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gstdio.h; path = Libraries/glib/glib/gstdio.h; sourceTree = "<group>"; };
34FC919907C5C45F00F531C0 /* gstdio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = gstdio.c; path = Libraries/glib/glib/gstdio.c; sourceTree = "<group>"; };
34FD87A20BADEEC900BBAA24 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
@@ -1489,7 +1489,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 342CE0D408596F4F00005C63 /* Build configuration list for PBXProject "Libotr" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
mainGroup = 0867D691FE84028FC02AAC07 /* LibpurpleFramework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -1874,10 +1874,7 @@
OTHER_REZFLAGS = "";
PRODUCT_NAME = glib;
SECTORDER_FLAGS = "";
- WARNING_CFLAGS = (
- "-Wmost",
- "-Wno-long-double",
- );
+ WARNING_CFLAGS = "-Wmost";
ZERO_LINK = NO;
};
name = Deployment;
@@ -1998,14 +1995,7 @@
DEAD_CODE_STRIPPING = YES;
GCC_DEBUGGING_SYMBOLS = full;
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_VERSION_i386 = 4.0;
- GCC_VERSION_ppc = 4.0;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.5;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Development;
@@ -2020,14 +2010,7 @@
);
DEAD_CODE_STRIPPING = YES;
GCC_DEBUGGING_SYMBOLS = full;
- GCC_VERSION_i386 = 4.0;
- GCC_VERSION_ppc = 4.0;
- MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
- MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk;
- SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.5;
};
name = Deployment;
};
diff -r 4440c29cbed8 -r c7939ac6314a Libraries/glib/config.h
--- a/Libraries/glib/config.h Tue Aug 25 12:05:57 2009 -0400
+++ b/Libraries/glib/config.h Sun Sep 06 12:55:01 2009 -0400
@@ -1,3 +1,5 @@
+#define AC_APPLE_UNIVERSAL_BUILD 1
+
#ifdef __LITTLE_ENDIAN__
#define INTEL_BUILD
#else
@@ -85,7 +87,11 @@
/* Byte contents of gmutex */
#ifdef INTEL_BUILD
- #define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+ #ifdef __LP64__
+ #define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+ #else
+ #define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+ #endif
#else
#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
#endif
@@ -106,10 +112,18 @@
#define GLIB_MINOR_VERSION 8
/* The size of gmutex, as computed by sizeof. */
-#define GLIB_SIZEOF_GMUTEX 44
+#ifdef __LP64__
+ #define GLIB_SIZEOF_GMUTEX 64
+#else
+ #define GLIB_SIZEOF_GMUTEX 44
+#endif
/* The size of system_thread, as computed by sizeof. */
-#define GLIB_SIZEOF_SYSTEM_THREAD 4
+#ifdef __LP64__
+ #define GLIB_SIZEOF_SYSTEM_THREAD 8
+#else
+ #define GLIB_SIZEOF_SYSTEM_THREAD 4
+#endif
/* Whether glib was compiled with debugging enabled */
#define G_COMPILED_WITH_DEBUGGING "minimum"
@@ -130,7 +144,11 @@
#define G_VA_COPY va_copy
/* 'va_lists' cannot be copies as values */
-/* #undef G_VA_COPY_AS_ARRAY */
+#ifdef __x86_64__
+ #define G_VA_COPY_AS_ARRAY 1
+#else
+ #undef G_VA_COPY_AS_ARRAY
+#endif
/* Define to 1 if you have `alloca', as a function or macro. */
#define HAVE_ALLOCA 1
@@ -438,8 +456,11 @@
#define SIZEOF_INT 4
/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
+#ifdef __LP64__
+ #define SIZEOF_LONG 8
+#else
+ #define SIZEOF_LONG 4
+#endif
/* The size of a `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
@@ -447,10 +468,18 @@
#define SIZEOF_SHORT 2
/* The size of a `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
+#ifdef __LP64__
+ #define SIZEOF_SIZE_T 8
+#else
+ #define SIZEOF_SIZE_T 4
+#endif
/* The size of a `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
+#ifdef __LP64__
+ #define SIZEOF_VOID_P 8
+#else
+ #define SIZEOF_VOID_P 4
+#endif
/* The size of a `__int64', as computed by sizeof. */
#define SIZEOF___INT64 0
@@ -463,6 +492,10 @@
STACK_DIRECTION = 0 => direction of growth unknown */
/* #undef STACK_DIRECTION */
+#ifdef __x86_64__
+ #define STATFS_ARGS 2
+#endif
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
More information about the commits
mailing list