From 3f2208036f3903ee5b733ef98aba7c62ba606616 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 27 Aug 2014 12:45:55 +0000 Subject: [PATCH] Fix build on OS X. Previously, building on OS X always assumed to be on an iDevice. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12090 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=283f7b32741d5831cccfd47012da05ea296d6463 --- fs.c | 14 ++++++-------- quakedef.h | 6 +++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fs.c b/fs.c index 9976cf22..994155aa 100644 --- a/fs.c +++ b/fs.c @@ -22,14 +22,6 @@ Boston, MA 02111-1307, USA */ -#ifdef __APPLE__ -// include SDL for IPHONEOS code -# include -# if TARGET_OS_IPHONE -# include -# endif -#endif - #include #include @@ -46,6 +38,12 @@ #endif #include "quakedef.h" + +#if TARGET_OS_IPHONE +// include SDL for IPHONEOS code +# include +#endif + #include "thread.h" #include "fs.h" diff --git a/quakedef.h b/quakedef.h index 5dd854a0..60d5db30 100644 --- a/quakedef.h +++ b/quakedef.h @@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef QUAKEDEF_H #define QUAKEDEF_H +#ifdef __APPLE__ +# include +#endif + #if defined(__GNUC__) && (__GNUC__ > 2) #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1))) #define DP_FUNC_PURE __attribute__ ((pure)) @@ -427,7 +431,7 @@ extern cvar_t sessionid; # define LINK_TO_LIBVORBIS 1 # define DP_MOBILETOUCH 1 # define DP_FREETYPE_STATIC 1 -#elif defined(TARGET_OS_IPHONE) /* must come first because it also defines MACOSX */ +#elif TARGET_OS_IPHONE /* must come first because it also defines MACOSX */ # define DP_OS_NAME "iPhoneOS" # define DP_OS_STR "iphoneos" # define USE_GLES2 1 -- 2.39.2