luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: link to AppKit on macOS.

Browse Source 
This is actually only necessary for gio, not for the other libraries.

https://bugzilla.gnome.org/show_bug.cgi?id=793565
This commit is contained in:
Dr. Michael Lauer
2018-03-05 15:13:59 +01:00
committed by Philip Withnall
parent b03c37cf3b
commit cc50c19544
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -230,7 +230,7 @@ AC_SUBST([CARBON_LIBS])
ac_cv_have_os_x_9_or_later="no" ac_cv_have_os_x_9_or_later="no"
AS_IF([test "x$glib_have_cocoa" = "xyes"], [ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
COCOA_LIBS="-Wl,-framework,Foundation" COCOA_LIBS="-Wl,-framework,Foundation -Wl,-framework,AppKit"
LDFLAGS="$LDFLAGS $COCOA_LIBS" LDFLAGS="$LDFLAGS $COCOA_LIBS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>

2
meson.build
View File

@@ -524,7 +524,7 @@ glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
if glib_have_cocoa if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true) glib_conf.set('HAVE_COCOA', true)
COCOA_LIBS='-Wl,-framework,Foundation' # FIXME: propagate to .pc files as well COCOA_LIBS='-Wl,-framework,Foundation -Wl,-framework,AppKit' # FIXME: propagate to .pc files as well
platform_ldflags += [COCOA_LIBS] platform_ldflags += [COCOA_LIBS]
else else
COCOA_LIBS='' COCOA_LIBS=''