[gtk+] gdk: Temporarily add -xobjective-c to CFLAGS
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Temporarily add -xobjective-c to CFLAGS
- Date: Mon, 22 Apr 2013 22:48:45 +0000 (UTC)
commit e58b19db0482e211e7f50c67d7d04bee6fde29ed
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 22 15:38:46 2013 -0700
gdk: Temporarily add -xobjective-c to CFLAGS
To enable compiling the quartz backend after a6a4428
gdk/Makefile.am | 3 ++-
gdk/gdkdisplaymanager.c | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index a32c6b5..0b81376 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -174,6 +174,7 @@ libgdk_3_la_LIBADD += x11/libgdk-x11.la
endif # USE_X11
if USE_QUARTZ
+libgdk_3_la_CFLAGS = -xobjective-c
libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
endif # USE_QUARTZ
@@ -370,7 +371,7 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
done >libgdk.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
rm libgdk.sourcefiles
-
+
../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
for F in $(libgdk_3_la_SOURCES); do \
case $$F in \
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 47b3760..698af66 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -38,11 +38,12 @@
#endif
#ifdef GDK_WINDOWING_QUARTZ
-/* We immediately include gdkquartzdisplaymanager.h here instead of
- * gdkquartz.h so that we do not have to enable -xobjective-c for the
- * "generic" GDK source code.
+/* When the gdk_quartz_display_open function is removed We can
+ * immediately include gdkquartzdisplaymanager.h here instead of
+ * gdkprivate-quartz.h so that we won't have to enable -xobjective-c
+ * for the "generic" GDK source code.
+ * #include "quartz/gdkquartzdisplaymanager.h"
*/
-#include "quartz/gdkquartzdisplaymanager.h"
#include "quartz/gdkprivate-quartz.h"
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]