blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 15:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

emit keyword is incompatible with oneTBB

Browse source
This commit is contained in:
Dan Paulat 2023-06-05 21:53:24 -05:00
parent b9f55fbb4d
commit ea6134acea
24 changed files with 81 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/scwx-qt.cmake
View file

@ -371,6 +371,12 @@ if (WIN32)
target_compile_definitions(supercell-wx PUBLIC WIN32_LEAN_AND_MEAN)
endif()
if (NOT MSVC)
# Qt emit keyword is incompatible with TBB
target_compile_definitions(scwx-qt PRIVATE QT_NO_EMIT)
target_compile_definitions(supercell-wx PRIVATE QT_NO_EMIT)
endif()
target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source
${FTGL_INCLUDE_DIR}
${IMGUI_INCLUDE_DIRS}