diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-10 16:36:12 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-10 16:36:12 -0700 |
| commit | 867c28ae03b3b2883713896765f3ff76eaf90a19 (patch) | |
| tree | 8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/citra/emu_window/emu_window_glfw.cpp | |
| parent | ac7bc214abe6b8f9eb2c122709ea99a0ca4b4245 (diff) | |
| parent | 4964a359e1a82f87a9772140fd1d933c5812c2e7 (diff) | |
Merge pull request #876 from linkmauve/include-cleanups
Cleanup includes, mostly in common
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 341b48d2..42fb683a 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" |