mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-18 13:36:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'unity_fix' into 'master'

Browse source 
Fix build with `OPENMW_UNITY_BUILD` enabled

See merge request OpenMW/openmw!132
This commit is contained in:
Alexei Dobrohotov 2019-07-28 18:46:27 +00:00
commit cad4ba0423
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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)