mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-27 06:55:54 -04:00
Merge branch 'unity_fix' into 'master'
Fix build with `OPENMW_UNITY_BUILD` enabled See merge request OpenMW/openmw!132
This commit is contained in:
commit
cad4ba0423
@ -215,6 +215,9 @@ endif()
|
|||||||
# Required for building the FFmpeg headers
|
# Required for building the FFmpeg headers
|
||||||
add_definitions(-D__STDC_CONSTANT_MACROS)
|
add_definitions(-D__STDC_CONSTANT_MACROS)
|
||||||
|
|
||||||
|
# Reqiuired for unity build
|
||||||
|
add_definitions(-DMYGUI_DONT_REPLACE_NULLPTR)
|
||||||
|
|
||||||
# TinyXML
|
# TinyXML
|
||||||
option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
|
option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
|
||||||
if (USE_SYSTEM_TINYXML)
|
if (USE_SYSTEM_TINYXML)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user