From 51a2661da647d6ad5610a98bbdb8c805f822265b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 11 Apr 2012 01:44:29 -0400 Subject: [PATCH] Link with Foundation framework on OSX. Signed-off-by: William Hua --- gio/Makefile.am | 11 +++++++---- 1 file 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 -- 2.7.4