summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2018-01-11 20:38:17 -0700
committerGravatar James Rowe2018-01-12 19:11:04 -0700
commitf5f28a4f6773e00e0f53454e881fb6d46dfbe6da (patch)
treeb8f7e7afb2a47d1aa2bfe1401c58a7a854496596 /src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
parentRemove gpu debugger and get yuzu qt to compile (diff)
downloadyuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.gz
yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.tar.xz
yuzu-f5f28a4f6773e00e0f53454e881fb6d46dfbe6da.zip
Get yuzu sdl to start compiling
Diffstat (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.cpp')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp6
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 @@
8#define SDL_MAIN_HANDLED 8#define SDL_MAIN_HANDLED
9#include <SDL.h> 9#include <SDL.h>
10#include <glad/glad.h> 10#include <glad/glad.h>
11#include "citra/emu_window/emu_window_sdl2.h"
12#include "common/logging/log.h" 11#include "common/logging/log.h"
13#include "common/scm_rev.h" 12#include "common/scm_rev.h"
14#include "common/string_util.h" 13#include "common/string_util.h"
@@ -16,7 +15,8 @@
16#include "input_common/keyboard.h" 15#include "input_common/keyboard.h"
17#include "input_common/main.h" 16#include "input_common/main.h"
18#include "input_common/motion_emu.h" 17#include "input_common/motion_emu.h"
19#include "network/network.h" 18#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
19
20 20
21void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { 21void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
22 TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); 22 TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0));
@@ -59,7 +59,6 @@ void EmuWindow_SDL2::OnResize() {
59 59
60EmuWindow_SDL2::EmuWindow_SDL2() { 60EmuWindow_SDL2::EmuWindow_SDL2() {
61 InputCommon::Init(); 61 InputCommon::Init();
62 Network::Init();
63 62
64 SDL_SetMainReady(); 63 SDL_SetMainReady();
65 64
@@ -116,7 +115,6 @@ EmuWindow_SDL2::~EmuWindow_SDL2() {
116 SDL_GL_DeleteContext(gl_context); 115 SDL_GL_DeleteContext(gl_context);
117 SDL_Quit(); 116 SDL_Quit();
118 117
119 Network::Shutdown();
120 InputCommon::Shutdown(); 118 InputCommon::Shutdown();
121} 119}
122 120