[glib] Link with Foundation framework on OSX.
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Link with Foundation framework on OSX.
- Date: Wed, 11 Apr 2012 14:32:06 +0000 (UTC)
commit 51a2661da647d6ad5610a98bbdb8c805f822265b
Author: Jeremy Huddleston <jeremyhu apple com>
Date: Wed Apr 11 01:44:29 2012 -0400
Link with Foundation framework on OSX.
Signed-off-by: William Hua <william attente ca>
gio/Makefile.am | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 7bc53a6..106a183 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -455,10 +455,6 @@ libgio_2_0_la_LIBADD = \
libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
-if OS_CARBON
-libgio_2_0_la_CFLAGS = -xobjective-c
-endif
-
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
@@ -492,6 +488,13 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
+# This condition is misnamed. It's really checking for Cocoa, not Carbon
+if OS_CARBON
+# This is dumb. The ObjC source file should be properly named .m
+libgio_2_0_la_CFLAGS = -xobjective-c
+libgio_2_0_la_LDFLAGS += -framework Foundation
+endif
+
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
gio-win32-res.o: gio.rc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]