From e6928077e263a9618acc555ebb19147309d656e5 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 30 May 2017 16:00:36 +0400 Subject: [PATCH] Fix wxOSX/Cocoa Xcode compilation Define NO_CXX11_REGEX to be able to compile Scintilla after it was updated to 3.6.6. Regression since c03ce59b86fc3dbb89f56bab62b0b969327d3942 . --- 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 d8cfc50143..313f1b9669 100644 --- a/build/osx/wx.xcconfig +++ b/build/osx/wx.xcconfig @@ -13,7 +13,7 @@ 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" ALWAYS_SEARCH_USER_PATHS = NO -WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 +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) GCC_PFE_FILE_C_DIALECTS = c++ objective-c++ GCC_C_LANGUAGE_STANDARD = gnu99