move iphone detection above macosx detection
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 18 Apr 2011 15:38:32 +0000 (15:38 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 18 Apr 2011 15:38:32 +0000 (15:38 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11064 d7cf8633-e32d-0410-b094-e92efae38249

quakedef.h

index d5688a7..d06f776 100644 (file)
@@ -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