diff options
| author | 2018-01-11 22:41:32 -0700 | |
|---|---|---|
| committer | 2018-01-12 19:11:05 -0700 | |
| commit | 70e65ee63a08c4f0716872a45faffade0e18e369 (patch) | |
| tree | 78f1ec5e39992cf581ca328027b7c8c8259e1bb9 /src/yuzu_cmd/emu_window | |
| parent | Removing unused settings and yuzu rebranding (diff) | |
| download | yuzu-70e65ee63a08c4f0716872a45faffade0e18e369.tar.gz yuzu-70e65ee63a08c4f0716872a45faffade0e18e369.tar.xz yuzu-70e65ee63a08c4f0716872a45faffade0e18e369.zip | |
Remove settings issues in sdl and fix a few files that broke in mingw
Diffstat (limited to 'src/yuzu_cmd/emu_window')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 7cbffba52..3d7cd06a4 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include "input_common/motion_emu.h" | 17 | #include "input_common/motion_emu.h" |
| 18 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 18 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 19 | 19 | ||
| 20 | |||
| 21 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { | 20 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { |
| 22 | TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); | 21 | TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); |
| 23 | InputCommon::GetMotionEmu()->Tilt(x, y); | 22 | InputCommon::GetMotionEmu()->Tilt(x, y); |
| @@ -106,7 +105,6 @@ EmuWindow_SDL2::EmuWindow_SDL2() { | |||
| 106 | OnResize(); | 105 | OnResize(); |
| 107 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); | 106 | OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); |
| 108 | SDL_PumpEvents(); | 107 | SDL_PumpEvents(); |
| 109 | SDL_GL_SetSwapInterval(Settings::values.use_vsync); | ||
| 110 | 108 | ||
| 111 | DoneCurrent(); | 109 | DoneCurrent(); |
| 112 | } | 110 | } |