Include SDL header as "SDL.h". This works with the CFLAGS output of pkg-config, picking up SDL no matter where it is installed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@274 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
cb5aa5435b
commit
efd894fe1e
|
@ -43,7 +43,7 @@ DInput dinput;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <SDL.h>
|
#include "SDL.h"
|
||||||
SDL_Joystick *joy;
|
SDL_Joystick *joy;
|
||||||
int numaxes = 0;
|
int numaxes = 0;
|
||||||
int numbuttons = 0;
|
int numbuttons = 0;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "GLInit.h"
|
#include "GLInit.h"
|
||||||
|
|
||||||
#ifdef MACOSX
|
#ifdef MACOSX
|
||||||
#include "SDL/SDL.h"
|
#include "SDL.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Handles OpenGL and the window
|
// Handles OpenGL and the window
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MACOSX
|
#ifdef MACOSX
|
||||||
#include "SDL/SDL.h"
|
#include "SDL.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "GUI/ConfigDlg.h"
|
#include "GUI/ConfigDlg.h"
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <SDL.h> // includes SDL
|
#include "SDL.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define SLEEP(x) Sleep(x)
|
#define SLEEP(x) Sleep(x)
|
||||||
|
|
Loading…
Reference in New Issue