diff options
| author |  Henrik Rydgård | 2016-04-29 02:17:31 +0200 |
|---|---|---|
| committer |  bunnei | 2016-04-28 20:17:31 -0400 |
| commit | 90501f20e6b91fcd2beaccf0b1a0174b189da09c (patch) | |
| tree | 9f909f9402d09e9a6175d37383aece363baba2f9 /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #1727 from MerryMage/minor-commit (diff) | |
| download | yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.tar.gz yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.tar.xz yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.zip | |
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709)
* Make Citra build with MICROPROFILE_ENABLED set to 0
* Buildfix with microprofile kept on
* moc did not like a dialog to conditionally exist.
* Cleanup
* Fix end of line
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 8e60b9cad..01b81c11c 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -71,7 +71,9 @@ void EmuThread::run() { | |||
| 71 | // Shutdown the core emulation | 71 | // Shutdown the core emulation |
| 72 | System::Shutdown(); | 72 | System::Shutdown(); |
| 73 | 73 | ||
| 74 | #if MICROPROFILE_ENABLED | ||
| 74 | MicroProfileOnThreadExit(); | 75 | MicroProfileOnThreadExit(); |
| 76 | #endif | ||
| 75 | 77 | ||
| 76 | render_window->moveContext(); | 78 | render_window->moveContext(); |
| 77 | } | 79 | } |