diff options
| author |  Yuri Kunde Schlesner | 2016-12-04 20:33:19 -0800 |
|---|---|---|
| committer |  GitHub | 2016-12-04 20:33:19 -0800 |
| commit | 100f5f41315aeb518250ca0603c64d797ddbc64e (patch) | |
| tree | 15078aafffe4aed23006b61e713c1483d256989a | |
| parent | Merge pull request #2269 from Subv/update_dynarmic (diff) | |
| parent | Disable Microprofile on Mingw builds (diff) | |
| download | yuzu-100f5f41315aeb518250ca0603c64d797ddbc64e.tar.gz yuzu-100f5f41315aeb518250ca0603c64d797ddbc64e.tar.xz yuzu-100f5f41315aeb518250ca0603c64d797ddbc64e.zip | |
Merge pull request #2200 from j-selby/fix-mingw-crash
Disable Microprofile on Mingw builds
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 33d18f5ea..25631b32e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -71,6 +71,9 @@ if (NOT MSVC) | |||
| 71 | 71 | ||
| 72 | if (MINGW) | 72 | if (MINGW) |
| 73 | add_definitions(-DMINGW_HAS_SECURE_API) | 73 | add_definitions(-DMINGW_HAS_SECURE_API) |
| 74 | # Microprofile causes crashes when launching titles on MinGW | ||
| 75 | add_definitions(-DMICROPROFILE_ENABLED=0) | ||
| 76 | |||
| 74 | if (MINGW_STATIC_BUILD) | 77 | if (MINGW_STATIC_BUILD) |
| 75 | add_definitions(-DQT_STATICPLUGIN) | 78 | add_definitions(-DQT_STATICPLUGIN) |
| 76 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") | 79 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") |