Commit 37f71d71 authored by John Ralls's avatar John Ralls

Bug 628936: Minimal change to pass introspection.

gobject_introspection's G-ir-scanner doesn't like the -xobjective-c
option needed to compile ObjectiveC features in quartz implementations
of certain gtk functions. This rearranges the compiler flag environment
variables in Makefile so that G-ir-scanner doesn't see them.
parent 00d79fdb
......@@ -54,7 +54,6 @@ AM_CPPFLAGS = \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS) \
$(gtk_clipboard_dnd_c_sources_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE)
if PLATFORM_WIN32
......@@ -793,7 +792,8 @@ if USE_QUARTZ
gtk_private_h_sources += \
gtksearchenginequartz.h
gtk_c_sources += $(gtk_use_quartz_c_sources)
gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c"
libgtk_3_la_CFLAGS = "-xobjective-c"
else
gtk_c_sources += $(gtk_use_stub_c_sources)
endif
......@@ -806,12 +806,8 @@ gtk_clipboard_dnd_c_sources = \
gtkdnd-quartz.c \
gtkquartz.c
gtk_clipboard_dnd_h_sources = gtkquartz.h
gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
else
gtk_clipboard_dnd_c_sources = \
gtkclipboard.c \
gtkdnd.c
gtk_clipboard_dnd_c_sources_CFLAGS =
gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
endif
EXTRA_DIST += gtkquartz.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment