mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 10:09:36 -06:00
Fixes Issue 2164
Conflicts are due to same file name when omitting full path git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4982 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -22,9 +22,10 @@
|
||||
|
||||
#include <vector> // System
|
||||
#include <cstdio>
|
||||
#include "../../../Core/InputCommon/Src/SDL.h" // Core
|
||||
#include "../../../Core/InputCommon/Src/InputCommon.h" // Core
|
||||
#include "../../../Core/InputCommon/Src/SDL_Util.h"
|
||||
#ifdef _WIN32
|
||||
#include "../../../Core/InputCommon/Src/XInput.h"
|
||||
#include "../../../Core/InputCommon/Src/XInput_Util.h"
|
||||
#elif defined(HAVE_X11) && HAVE_X11
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
Reference in New Issue
Block a user