games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Define Q_NO_EMIT in cmake in order to include moc compilation

Browse Source
This commit is contained in:
Ivan Savenko 2024-12-21 19:24:26 +00:00
parent 95a07ee5cb
commit 2ebf37beb0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

3
Global.h
View File

@ -273,9 +273,6 @@ using TLockGuardRec = std::lock_guard<std::recursive_mutex>;
#define VCMI_LIB_WRAP_NAMESPACE(x) ::x #define VCMI_LIB_WRAP_NAMESPACE(x) ::x
#endif #endif
// Qt defines 'emit' as macros, which conflicts with TBB definition of method with same name
#define QT_NO_EMIT
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */
/* VCMI standard library */ /* VCMI standard library */
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */