mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-08 00:59:44 +00:00
Commited chaoscode's patch to fix re2 and mp1
disabled njoy on linux as it doesn't compile (need to talk to JP about the right fix) added ugly hack to include the right SDL.h on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2179 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
c4c8bde34d
commit
1026b3b6f1
3 changed files with 9 additions and 3 deletions
|
@ -38,7 +38,11 @@
|
|||
#include <vector>
|
||||
#include <cmath>
|
||||
|
||||
#ifdef _WIN32 // UGLY HACK FIXME PLEAAAAAAASE
|
||||
#include <SDL.h> // Externals
|
||||
#else
|
||||
#include <SDL/SDL.h> // Externals
|
||||
#endif
|
||||
|
||||
#include "Common.h" // Common
|
||||
#include "ConsoleWindow.h"
|
||||
|
@ -202,4 +206,4 @@ std::vector<int> Pad_Square_to_Circle(int _x, int _y, int _pad, CONTROLLER_MAPPI
|
|||
} // InputCommon
|
||||
|
||||
|
||||
#endif // _SDL_h
|
||||
#endif // _SDL_h
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue