adding lexlib header include, turning off utf8 default

[wxWidgets.git] / build / osx / wx.xcconfig

diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig
index 17559f8999b366ccf117c947b62e8d5857dd10af..032c3b4af79b3b74cdcba9c892c256e2ac2ab59b 100644 (file)
--- a/build/osx/wx.xcconfig
+++ b/build/osx/wx.xcconfig
@@ -8,11 +8,11 @@ PRODUCT_NAME = wx_osx_$(WXTOOLKIT)
 OTHER_CFLAGS = -Wall -Wundef -fno-strict-aliasing -fno-common -fvisibility=hidden 
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 
 OTHER_CFLAGS = -Wall -Wundef -fno-strict-aliasing -fno-common -fvisibility=hidden 
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 

-GCC_PREFIX_HEADER = ../../include/wx/wxprec.h
+GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h

 GCC_PRECOMPILE_PREFIX_HEADER = YES
 HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"

-USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(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
 ALWAYS_SEARCH_USER_PATHS = NO

-GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=1
+GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1

 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
 GCC_C_LANGUAGE_STANDARD = gnu99
 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
 GCC_C_LANGUAGE_STANDARD = gnu99