Fix build on OS X. Previously, building on OS X always assumed to be on an iDevice.
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 27 Aug 2014 12:45:55 +0000 (12:45 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 27 Aug 2014 12:45:55 +0000 (12:45 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12090 d7cf8633-e32d-0410-b094-e92efae38249

fs.c
quakedef.h

diff --git a/fs.c b/fs.c
index 9976cf2..994155a 100644 (file)
--- a/fs.c
+++ b/fs.c
                Boston, MA  02111-1307, USA
 */
 
-#ifdef __APPLE__
-// include SDL for IPHONEOS code
-# include <TargetConditionals.h>
-# if TARGET_OS_IPHONE
-#  include <SDL.h>
-# endif
-#endif
-
 #include <limits.h>
 #include <fcntl.h>
 
 #endif
 
 #include "quakedef.h"
+
+#if TARGET_OS_IPHONE
+// include SDL for IPHONEOS code
+# include <SDL.h>
+#endif
+
 #include "thread.h"
 
 #include "fs.h"
index 5dd854a..60d5db3 100644 (file)
@@ -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 <TargetConditionals.h>
+#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