From bfa7035bdcefaae2a493958ba0bf4c2378c1215c Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 13 Feb 2018 22:49:36 +0100 Subject: [PATCH] Fix Xcode compilation When using Xcode to compile wxCocoa a system's expat.h gets included instead of wx', and in the case of wxiOS libexpat is not present and thus expat.h is not found. Fix by correcting the path to expat.h . Regression since 824134d42751e08d2a1a01b67854db4707e62abe . --- build/osx/wx.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig index 313f1b9669..42339d528b 100644 --- a/build/osx/wx.xcconfig +++ b/build/osx/wx.xcconfig @@ -11,7 +11,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h GCC_PRECOMPILE_PREFIX_HEADER = YES HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex" -USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" +USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" ALWAYS_SEARCH_USER_PATHS = NO WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS)