Merge branch 'master' into jgrpp

2020-07-07 17:28:19 +01:00
parent 641e682e3f de4dc792a9
commit 737ced9f50
18 changed files with 138 additions and 119 deletions
--- a/cmake/CompileFlags.cmake
+++ b/cmake/CompileFlags.cmake
@@ -23,6 +23,9 @@ 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)
+
        # 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")
    endif (MSVC)