Fix SDL detection.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1677 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-04-23 23:57:17 +00:00
parent 05c9dfa81c
commit ca46727d02
4 changed files with 7 additions and 4 deletions
+2 -1
View File
@@ -18,9 +18,10 @@
#ifdef GFXMODULE_SDL #ifdef GFXMODULE_SDL
#include "port.h"
#include "sdl_common.h" #include "sdl_common.h"
#include "libs/threadlib.h" #include "libs/threadlib.h"
#include "SDL_thread.h" #include SDL_INCLUDE(SDL_thread.h)
#include "libs/graphics/drawcmd.h" #include "libs/graphics/drawcmd.h"
#include "libs/graphics/sdl/dcqueue.h" #include "libs/graphics/sdl/dcqueue.h"
+2 -1
View File
@@ -82,7 +82,8 @@ typedef unsigned short wchar_t;
#else /* !defined(WIN32) */ #else /* !defined(WIN32) */
#include <SDL_opengl.h> #include "port.h"
#include SDL_INCLUDE(SDL_opengl.h)
#endif /* WIN32 */ #endif /* WIN32 */
#endif /* HAVE_OPENGL */ #endif /* HAVE_OPENGL */
@@ -25,7 +25,6 @@
#include "dcqueue.h" #include "dcqueue.h"
#include "options.h" #include "options.h"
#include "uqmversion.h" #include "uqmversion.h"
#include "SDL_thread.h"
#include "libs/graphics/drawcmd.h" #include "libs/graphics/drawcmd.h"
#include "libs/input/sdl/vcontrol.h" #include "libs/input/sdl/vcontrol.h"
#include "bbox.h" #include "bbox.h"
@@ -34,6 +33,7 @@
#include "controls.h" #include "controls.h"
// XXX: Should not be included from here. // XXX: Should not be included from here.
#include "uqmdebug.h" #include "uqmdebug.h"
#include SDL_INCLUDE(SDL_thread.h)
SDL_Surface *SDL_Video; SDL_Surface *SDL_Video;
SDL_Surface *SDL_Screen; SDL_Surface *SDL_Screen;
@@ -525,7 +525,8 @@ MIKMODAPI extern struct MLOADER load_xm; /* FastTracker 2 (by Triton) */
/* SDL_RWops compatability */ /* SDL_RWops compatability */
#ifdef USE_RWOPS #ifdef USE_RWOPS
#include "SDL_rwops.h" #include "port.h"
#include SDL_INCLUDE(SDL_rwops.h)
MIKMODAPI extern MODULE* Player_LoadRW(SDL_RWops*,int,BOOL); MIKMODAPI extern MODULE* Player_LoadRW(SDL_RWops*,int,BOOL);
#endif /* USE_RWOPS */ #endif /* USE_RWOPS */
/* End SDL_RWops compatability */ /* End SDL_RWops compatability */