Fix build errors after modifying CMake setup.h.in

Always set a value to ICONV_CONST so it will be defined in setup.h.
Add a check for strtoull to prevent a macro redefined warning.
Link with WebKit framework to fix macOS build with wxUSE_WEBKIT.
This commit is contained in:
Maarten Bent
2018-10-24 22:40:39 +02:00
parent 6363db488f
commit a02bb61e90
2 changed files with 7 additions and 1 deletions

View File

@@ -70,6 +70,11 @@ if(WXOSX_COCOA)
wx_lib_link_libraries(core PUBLIC
"-framework AudioToolbox"
)
if(wxUSE_WEBKIT)
wx_lib_link_libraries(core PUBLIC
"-framework WebKit"
)
endif()
endif()
if(WXGTK AND wxUSE_PRIVATE_FONTS)
wx_lib_include_directories(core PUBLIC