diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-20 21:34:41 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 01:36:53 +0200 |
| commit | 79aa1b0808e8561560b58dab950ba4cd36e6aabb (patch) | |
| tree | 43199636ea7931eff5bc060d868737aeeb745b9d /src/citra/emu_window | |
| parent | Common: Remove now-unused EMU_PLATFORM define, fixes issue #373. (diff) | |
| download | yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar.gz yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar.bz2 yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar.lz yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar.xz yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.tar.zst yuzu-79aa1b0808e8561560b58dab950ba4cd36e6aabb.zip | |
Diffstat (limited to 'src/citra/emu_window')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 12 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 341b48d2a..42fb683a9 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -2,13 +2,25 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> +#include <cstdlib> +#include <string> + +// Let’s use our own GL header, instead of one from GLFW. +#include "video_core/renderer_opengl/generated/gl_3_2_core.h" +#define GLFW_INCLUDE_NONE #include <GLFW/glfw3.h> +#include "common/assert.h" +#include "common/key_map.h" #include "common/logging/log.h" +#include "common/scm_rev.h" +#include "common/string_util.h" #include "video_core/video_core.h" #include "core/settings.h" +#include "core/hle/service/hid/hid.h" #include "citra/emu_window/emu_window_glfw.h" diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 16c109b79..7ccd5e6aa 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -4,6 +4,8 @@ #pragma once +#include <utility> + #include "common/emu_window.h" struct GLFWwindow; |