diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-20 17:21:23 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-21 04:15:47 +0200 |
| commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
| tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/citra/emu_window | |
| parent | Manually tweak source formatting and then re-run clang-format (diff) | |
| download | yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.bz2 yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.lz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.zst yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip | |
Diffstat (limited to 'src/citra/emu_window')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 8 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 42f2a7553..7df054208 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -5,22 +5,16 @@ #include <algorithm> #include <cstdlib> #include <string> - #define SDL_MAIN_HANDLED #include <SDL.h> - #include <glad/glad.h> - +#include "citra/emu_window/emu_window_sdl2.h" #include "common/key_map.h" #include "common/logging/log.h" #include "common/scm_rev.h" #include "common/string_util.h" - #include "core/hle/service/hid/hid.h" #include "core/settings.h" - -#include "citra/emu_window/emu_window_sdl2.h" - #include "video_core/video_core.h" void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h index d4d86821d..e4d14ef12 100644 --- a/src/citra/emu_window/emu_window_sdl2.h +++ b/src/citra/emu_window/emu_window_sdl2.h @@ -5,7 +5,6 @@ #pragma once #include <utility> - #include "common/emu_window.h" struct SDL_Window; |