luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: fix compiling on macOS by moving all Objective-C file into libgio-objc-2.0

Browse Source 
Previously, only gnextstepsettingsbackend.c was taken into account.

https://bugzilla.gnome.org/show_bug.cgi?id=793565
This commit is contained in:
Dr. Michael Lauer 2018-02-26 13:08:27 +01:00 committed by Philip Withnall
parent 6cea0c68fb
commit 170466db26
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/Makefile.am
View File

@ -289,12 +289,6 @@ unix_sources = \
$(portal_sources) \ $(portal_sources) \
$(NULL) $(NULL)
if OS_COCOA
if MAC_OS_X_9
unix_sources += gcocoanotificationbackend.c
endif
endif
giounixincludedir=$(includedir)/gio-unix-2.0/gio giounixincludedir=$(includedir)/gio-unix-2.0/gio
giounixinclude_HEADERS = \ giounixinclude_HEADERS = \
gfiledescriptorbased.h \ gfiledescriptorbased.h \
@ -401,11 +395,6 @@ portal_sources = \
$(xdp_dbus_built_sources) \ $(xdp_dbus_built_sources) \
$(NULL) $(NULL)
if OS_COCOA
contenttype_sources += gosxcontenttype.c
appinfo_sources += gosxappinfo.c gosxappinfo.h
endif
if OS_UNIX if OS_UNIX
if !OS_COCOA if !OS_COCOA
contenttype_sources += gcontenttype.c contenttype_sources += gcontenttype.c
@ -619,7 +608,12 @@ if OS_COCOA
libgio_objc_2_0_la_CFLAGS = $(libgio_2_0_la_CFLAGS) -xobjective-c libgio_objc_2_0_la_CFLAGS = $(libgio_2_0_la_CFLAGS) -xobjective-c
libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS) libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
libgio_objc_2_0_la_SOURCES = gnextstepsettingsbackend.c libgio_objc_2_0_la_SOURCES = \
gnextstepsettingsbackend.c \
gosxcontenttype.c \
gosxappinfo.c \
gosxappinfo.h \
gcocoanotificationbackend.c
noinst_LTLIBRARIES += libgio-objc-2.0.la noinst_LTLIBRARIES += libgio-objc-2.0.la
libgio_2_0_la_LIBADD += libgio-objc-2.0.la libgio_2_0_la_LIBADD += libgio-objc-2.0.la