diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-03-01 17:24:18 +0000 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-03-02 14:09:02 +0000 |
| commit | ba2a54a9dd6e5a263c5e6886e55b3bc55b95b4ab (patch) | |
| tree | 182d660b2f2c8572266144f46817e5a221aa4caf /src/citra/citra.cpp | |
| parent | 2b00bdec1f83be82acb65bb316086858134e5766 (diff) | |
Dependencies: Remove GLFW, Add SDL2
citra: Remove GLFW, Add SDL2
FindSDL2: Do not CACHE SDL2_* variables if library is not found
EmuWindow_SDL2: Set minimal client area at initialisation time
EmuWindow_SDL2: Corrections
EmuWindow_SDL2: Fix no decorations on startup on OS X
cmake: windows_copy_files
Diffstat (limited to 'src/citra/citra.cpp')
| -rw-r--r-- | src/citra/citra.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index c96fc13744..415b98a052 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -27,7 +27,7 @@ #include "core/loader/loader.h" #include "citra/config.h" -#include "citra/emu_window/emu_window_glfw.h" +#include "citra/emu_window/emu_window_sdl2.h" #include "video_core/video_core.h" @@ -76,7 +76,7 @@ int main(int argc, char **argv) { GDBStub::ToggleServer(Settings::values.use_gdbstub); GDBStub::SetServerPort(static_cast<u32>(Settings::values.gdbstub_port)); - EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; + EmuWindow_SDL2* emu_window = new EmuWindow_SDL2; VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit; |