From ff21730d8e582ec7e60950771c4f8e4f9bbf82a1 Mon Sep 17 00:00:00 2001
From: Jeremy Tan <jtanx@outlook.com>
Date: Sat, 20 Jul 2019 15:10:34 +0800
Subject: [PATCH] Fix gdkconfig.h generation for GDK_WINDOWING_QUARTZ

---
 gdk/gdkconfig.h.meson | 1 +
 gdk/meson.build       | 3 ++-
 gtk/meson.build       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson
index 14f9e8e1ae..7db19e0470 100644
--- a/gdk/gdkconfig.h.meson
+++ b/gdk/gdkconfig.h.meson
@@ -14,6 +14,7 @@ G_BEGIN_DECLS
 #mesondefine GDK_WINDOWING_BROADWAY
 #mesondefine GDK_WINDOWING_WAYLAND
 #mesondefine GDK_WINDOWING_WIN32
+#mesondefine GDK_WINDOWING_QUARTZ
 
 G_END_DECLS
 
diff --git a/gdk/meson.build b/gdk/meson.build
index aa2e0ae86c..d56803486d 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -165,6 +165,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_X11', x11_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
+gdkconfig_cdata.set('GDK_WINDOWING_QUARTZ', quartz_enabled)
 
 gdkconfig = configure_file(
   input  : 'gdkconfig.h.meson',
@@ -268,7 +269,7 @@ foreach backend : ['broadway', 'quartz', 'wayland', 'win32', 'x11', 'mir']
       gdk_backends_gen_headers += get_variable('gdk_@0@_gen_headers'.format(backend))
     endif
     if backend == 'quartz'
-      common_cflags += ['-DGDK_WINDOWING_QUARTZ', '-xobjective-c']
+      common_cflags += ['-xobjective-c']
     endif
   endif
 endforeach
diff --git a/gtk/meson.build b/gtk/meson.build
index ac8c1a9926..573b65491c 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -899,7 +899,7 @@ endif
 
 if quartz_enabled
   gtk_sources += gtk_use_quartz_sources
-  gtk_cargs += ['-DGDK_WINDOWING_QUARTZ', '-xobjective-c']
+  gtk_cargs += ['-xobjective-c']
 endif
 
 # So we don't add these twice