dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/hotkeys.cpp
This commit is contained in:
Jonathan G Rennison
2020-09-21 02:06:09 +01:00
parent 4763f441f6 53a3d940b1
commit aea747be08
5 changed files with 110 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/CompileFlags.cmake
View File

@@ -23,8 +23,10 @@ macro(compile_flags)
# C++11 standard". We need C++11 for the way we use threads.
add_compile_options(/Zc:rvalueCast)
# Enable multi-threaded compilation.
add_compile_options(/MP)
if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# Enable multi-threaded compilation.
add_compile_options(/MP)
endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")