From e15d417a7602cc812a5965adc88a44fcf08652cf Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 22 Jun 2017 22:23:28 +0200
Subject: [PATCH] Move config_xcode.h include to setup.h

In order to allow inclusion of configure determined flags via a wx/setup.h include also for xcode builds, the include has to move into the setup0.h template
---
 include/wx/osx/setup0.h | 5 +++++
 include/wx/platform.h   | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 7a4f799e0b..8db8c9a0f3 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -11,6 +11,11 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 
+#ifdef __WXMAC_XCODE__
+// while configure based builds have the flags prepended, we must do this here
+// for xcode based builds
+#include "wx/osx/config_xcode.h"
+#endif
 
 /* --- start common options --- */
 // ----------------------------------------------------------------------------
diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2f5dea1d99..792dae400c 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -55,7 +55,6 @@
 #            define NSAppKitVersionNumber10_11 1404
 #        endif
 #    endif
-#    include "wx/osx/config_xcode.h"
 #    ifndef __WXOSX__
 #        define __WXOSX__ 1
 #    endif