diff options
| author |  bunnei | 2015-01-09 10:15:43 -0500 |
|---|---|---|
| committer | bunnei | 2015-01-09 10:15:43 -0500 |
| commit | e5cf344155cd3b20c47ae62afc8c0d66998cdea9 (patch) | |
| tree | cb012468d60f8eeaf3f101718264b2720c1450c7 | |
| parent | Merge pull request #255 from Subv/cbranch_3 (diff) | |
| parent | CMake: Enable VS parallel builds for a good reduction in compile times (diff) | |
| download | yuzu-e5cf344155cd3b20c47ae62afc8c0d66998cdea9.tar.gz yuzu-e5cf344155cd3b20c47ae62afc8c0d66998cdea9.tar.xz yuzu-e5cf344155cd3b20c47ae62afc8c0d66998cdea9.zip | |
Merge pull request #453 from yuriks/vs-parallel
CMake: Enable VS parallel builds for a good reduction in compile times
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 884520cef..2cba5e8a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -17,6 +17,7 @@ else() | |||
| 17 | # As far as I can tell, there's no way to override the CMake defaults while leaving user | 17 | # As far as I can tell, there's no way to override the CMake defaults while leaving user |
| 18 | # changes intact, so we'll just clobber everything and say sorry. | 18 | # changes intact, so we'll just clobber everything and say sorry. |
| 19 | message(STATUS "Cache compiler flags ignored, please edit CMakeFiles.txt to change the flags.") | 19 | message(STATUS "Cache compiler flags ignored, please edit CMakeFiles.txt to change the flags.") |
| 20 | # /MP - Multi-threaded compilation | ||
| 20 | # /MD - Multi-threaded runtime | 21 | # /MD - Multi-threaded runtime |
| 21 | # /Ox - Full optimization | 22 | # /Ox - Full optimization |
| 22 | # /Oi - Use intrinsic functions | 23 | # /Oi - Use intrinsic functions |
| @@ -24,7 +25,7 @@ else() | |||
| 24 | # /GR- - Disable RTTI | 25 | # /GR- - Disable RTTI |
| 25 | # /GS- - No stack buffer overflow checks | 26 | # /GS- - No stack buffer overflow checks |
| 26 | # /EHsc - C++-only exception handling semantics | 27 | # /EHsc - C++-only exception handling semantics |
| 27 | set(optimization_flags "/MD /Ox /Oi /Oy- /DNDEBUG /GR- /GS- /EHsc") | 28 | set(optimization_flags "/MP /MD /Ox /Oi /Oy- /DNDEBUG /GR- /GS- /EHsc") |
| 28 | # /Zi - Output debugging information | 29 | # /Zi - Output debugging information |
| 29 | # /Zo - enahnced debug info for optimized builds | 30 | # /Zo - enahnced debug info for optimized builds |
| 30 | set(CMAKE_C_FLAGS_RELEASE "${optimization_flags} /Zi" CACHE STRING "" FORCE) | 31 | set(CMAKE_C_FLAGS_RELEASE "${optimization_flags} /Zi" CACHE STRING "" FORCE) |