summaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-03-02 20:32:32 -0500
committerGravatar bunnei2016-03-02 20:32:32 -0500
commit699b2a6571849bddda4fee3eb31f2f7b7e83a882 (patch)
tree0db944960a7f7a924f34afa1222ad6e9d3421b11 /src/citra/citra.cpp
parentMerge pull request #1434 from Kloen/legend (diff)
parentConfig: Use unique_ptr instead of raw pointer (diff)
downloadyuzu-699b2a6571849bddda4fee3eb31f2f7b7e83a882.tar.gz
yuzu-699b2a6571849bddda4fee3eb31f2f7b7e83a882.tar.xz
yuzu-699b2a6571849bddda4fee3eb31f2f7b7e83a882.zip
Merge pull request #1403 from MerryMage/sdl
Dependencies: Remove GLFW, Add SDL2
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index c96fc1374..415b98a05 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -27,7 +27,7 @@
27#include "core/loader/loader.h" 27#include "core/loader/loader.h"
28 28
29#include "citra/config.h" 29#include "citra/config.h"
30#include "citra/emu_window/emu_window_glfw.h" 30#include "citra/emu_window/emu_window_sdl2.h"
31 31
32#include "video_core/video_core.h" 32#include "video_core/video_core.h"
33 33
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
76 GDBStub::ToggleServer(Settings::values.use_gdbstub); 76 GDBStub::ToggleServer(Settings::values.use_gdbstub);
77 GDBStub::SetServerPort(static_cast<u32>(Settings::values.gdbstub_port)); 77 GDBStub::SetServerPort(static_cast<u32>(Settings::values.gdbstub_port));
78 78
79 EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; 79 EmuWindow_SDL2* emu_window = new EmuWindow_SDL2;
80 80
81 VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; 81 VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer;
82 VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit; 82 VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit;