summaryrefslogtreecommitdiff
path: root/src/core/frontend/emu_window.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2021-04-14 17:47:18 -0700
committerGravatar GitHub2021-04-14 17:47:18 -0700
commitde5bf640b7309450357074083a9ac397f251adbc (patch)
treee7c9b9845f7751c2cc4a00dbf05798ff2a69490d /src/core/frontend/emu_window.cpp
parentMerge pull request #6197 from ameerj/kreslimit-cleanup (diff)
parentcommon: Move settings to common from core. (diff)
downloadyuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.gz
yuzu-de5bf640b7309450357074083a9ac397f251adbc.tar.xz
yuzu-de5bf640b7309450357074083a9ac397f251adbc.zip
Merge pull request #6196 from bunnei/asserts-setting
core: settings: Add setting for debug assertions and disable by default.
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
-rw-r--r--src/core/frontend/emu_window.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index ee7a58b1c..474de9206 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -4,9 +4,9 @@
4 4
5#include <cmath> 5#include <cmath>
6#include <mutex> 6#include <mutex>
7#include "common/settings.h"
7#include "core/frontend/emu_window.h" 8#include "core/frontend/emu_window.h"
8#include "core/frontend/input.h" 9#include "core/frontend/input.h"
9#include "core/settings.h"
10 10
11namespace Core::Frontend { 11namespace Core::Frontend {
12 12