aboutsummaryrefslogtreecommitdiffstats
path: root/code/sdl
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-11-02 23:36:23 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-11-02 23:36:23 +0000
commit56902c5a9b6b59341f71098566f2d84a4af4b572 (patch)
tree7c07b055412384790e939335a15c1fda78e05461 /code/sdl
parentc4ac4295935c145c992fdfd27085c3f95559c3a0 (diff)
downloadioquake3-aero-56902c5a9b6b59341f71098566f2d84a4af4b572.tar.gz
ioquake3-aero-56902c5a9b6b59341f71098566f2d84a4af4b572.zip
* (bug 3393) Blank user names still possible (Michael Jard <kfaust@gmail.com>)
* (bug 3363) Download percentage overflow (Martin Doucha <next_ghost@quick.cz>) * (bug 3390) MSVC project (Julian Priestley <juzley@gmail.com>) * For OS X and MinGW ports, don't -I code/SDL when USE_LOCAL_HEADERS is 0 git-svn-id: svn://svn.icculus.org/quake3/trunk@1204 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/sdl')
-rw-r--r--code/sdl/sdl_gamma.c7
-rw-r--r--code/sdl/sdl_glimp.c12
-rw-r--r--code/sdl/sdl_input.c6
-rw-r--r--code/sdl/sdl_snd.c6
4 files changed, 26 insertions, 5 deletions
diff --git a/code/sdl/sdl_gamma.c b/code/sdl/sdl_gamma.c
index 2673700..71a42c8 100644
--- a/code/sdl/sdl_gamma.c
+++ b/code/sdl/sdl_gamma.c
@@ -20,7 +20,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+# include "SDL.h"
+#else
+# include <SDL.h>
+#endif
+
#include "../renderer/tr_local.h"
#include "../qcommon/qcommon.h"
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 5befe19..c5954ac 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -20,7 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+# include "SDL.h"
+#else
+# include <SDL.h>
+#endif
#if !SDL_VERSION_ATLEAST(1, 2, 10)
#define SDL_GL_ACCELERATED_VISUAL 15
@@ -30,7 +34,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif
#ifdef SMP
-#include "SDL_thread.h"
+# ifdef USE_LOCAL_HEADERS
+# include "SDL_thread.h"
+# else
+# include <SDL_thread.h>
+# endif
#endif
#include <stdarg.h>
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 2e610a8..0663c7f 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -20,7 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+# include "SDL.h"
+#else
+# include <SDL.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
diff --git a/code/sdl/sdl_snd.c b/code/sdl/sdl_snd.c
index dfc2316..a131db7 100644
--- a/code/sdl/sdl_snd.c
+++ b/code/sdl/sdl_snd.c
@@ -23,7 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdlib.h>
#include <stdio.h>
-#include "SDL.h"
+#ifdef USE_LOCAL_HEADERS
+# include "SDL.h"
+#else
+# include <SDL.h>
+#endif
#include "../qcommon/q_shared.h"
#include "../client/snd_local.h"