diff options
| author | James Rowe <jroweboy@gmail.com> | 2018-01-12 04:38:17 +0100 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2018-01-13 03:11:04 +0100 |
| commit | f5f28a4f6773e00e0f53454e881fb6d46dfbe6da (patch) | |
| tree | b8f7e7afb2a47d1aa2bfe1401c58a7a854496596 /src/yuzu_cmd/emu_window | |
| parent | Remove gpu debugger and get yuzu qt to compile (diff) | |
| download | yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.gz yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.bz2 yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.lz yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.xz yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.zst yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.zip | |
Diffstat (limited to 'src/yuzu_cmd/emu_window')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index e65b04e4b..7cbffba52 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -8,7 +8,6 @@ #define SDL_MAIN_HANDLED #include <SDL.h> #include <glad/glad.h> -#include "citra/emu_window/emu_window_sdl2.h" #include "common/logging/log.h" #include "common/scm_rev.h" #include "common/string_util.h" @@ -16,7 +15,8 @@ #include "input_common/keyboard.h" #include "input_common/main.h" #include "input_common/motion_emu.h" -#include "network/network.h" +#include "yuzu_cmd/emu_window/emu_window_sdl2.h" + void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); @@ -59,7 +59,6 @@ void EmuWindow_SDL2::OnResize() { EmuWindow_SDL2::EmuWindow_SDL2() { InputCommon::Init(); - Network::Init(); SDL_SetMainReady(); @@ -116,7 +115,6 @@ EmuWindow_SDL2::~EmuWindow_SDL2() { SDL_GL_DeleteContext(gl_context); SDL_Quit(); - Network::Shutdown(); InputCommon::Shutdown(); } |