piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6150 from MerryMage/macos-wx-underscore-macros

Browse Source 
wxWidgets3: Fix compilation due to change in assert macros in macOS 10.13 SDK
This commit is contained in:
Mat M
2017-10-30 21:04:11 -04:00
committed by GitHub
parent eaa2742b41 2d6047472b
commit 224996d652
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -825,7 +825,7 @@ target_compile_definitions(wx PRIVATE "WXBUILDING")
target_compile_options(wx PRIVATE "-w")
if(APPLE)
target_compile_definitions(wx PRIVATE "__WXOSX_COCOA__")
target_compile_definitions(wx PRIVATE "__WXOSX_COCOA__" "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1")
target_sources(wx PRIVATE
${SRCS_GENERICOSX}
${SRCS_OSX}