diff options
| author | nakeee <nakeee@gmail.com> | 2009-02-09 18:31:16 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-02-09 18:31:16 +0000 |
| commit | 1026b3b6f1abbbed313d71a3d41f80a14c393dbb (patch) | |
| tree | 8720ad77cef29d7a738bdc4b6a7d17a5f268748a /Source/Core/InputCommon | |
| parent | c4c8bde34d7a7b971f1f2933f960bfcd6308bac3 (diff) | |
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
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/SDL.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/SDL.h b/Source/Core/InputCommon/Src/SDL.h index 3fb9d8b06d..e54895d7cd 100644 --- a/Source/Core/InputCommon/Src/SDL.h +++ b/Source/Core/InputCommon/Src/SDL.h @@ -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
\ No newline at end of file +#endif // _SDL_h
|