games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Define Q_NO_EMIT only in editor

Browse Source
This commit is contained in:
Ivan Savenko
2024-12-24 13:53:55 +00:00
parent 814234017d
commit fdc4608e1e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -255,10 +255,6 @@ if(ENABLE_GOLDMASTER)
add_definitions(-DENABLE_GOLDMASTER)
endif()
# Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name
add_definitions(-DQT_NO_EMIT)
if(APPLE_IOS)
set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)

3
mapeditor/CMakeLists.txt
View File

@@ -223,6 +223,9 @@ if(APPLE)
set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER vcmieditor)
endif()
# Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name
target_compile_definitions(vcmieditor PRIVATE QT_NO_EMIT)
if(ENABLE_STATIC_LIBS OR NOT (ENABLE_EDITOR AND ENABLE_LAUNCHER))
target_compile_definitions(vcmieditor PRIVATE VCMIQT_STATIC)
endif()