From f8234aea8f54d83b468a0c3b5e131142937548b1 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 18 Apr 2011 15:38:32 +0000 Subject: [PATCH] move iphone detection above macosx detection git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11064 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=0117364e01ec58a02c71673d1b90f6b355a7cf3a --- quakedef.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quakedef.h b/quakedef.h index d5688a77..d06f7767 100644 --- a/quakedef.h +++ b/quakedef.h @@ -429,17 +429,17 @@ extern cvar_t developer_loading; #elif defined(__OpenBSD__) # define DP_OS_NAME "OpenBSD" # define DP_OS_STR "openbsd" +#elif defined(TARGET_OS_IPHONE) +# define DP_OS_NAME "iPhoneOS" +# define DP_OS_STR "iphoneos" +# define USE_GLES2 1 +#else #elif defined(MACOSX) # define DP_OS_NAME "Mac OS X" # define DP_OS_STR "osx" #elif defined(__MORPHOS__) # define DP_OS_NAME "MorphOS" # define DP_OS_STR "morphos" -#elif defined(TARGET_OS_IPHONE) -# define DP_OS_NAME "iPhoneOS" -# define DP_OS_STR "iphoneos" -# define USE_GLES2 1 -#else # define DP_OS_NAME "Unknown" #endif -- 2.39.2