X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=quakedef.h;h=61ab84914fdab063ddaeb03cea56cf2b7783b40a;hb=f7d07d8eab555dd446483d77cf9465489a4cf0ec;hp=6bd5ddfaee6bd78214cc9b56c70c2daf6072f759;hpb=29e0241795779f481dffbcd835a35ec9bf515ff6;p=xonotic%2Fdarkplaces.git

diff --git a/quakedef.h b/quakedef.h
index 6bd5ddfa..61ab8491 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -396,7 +396,9 @@ extern char engineversion[128];
 #include "input.h"
 #include "keys.h"
 #include "console.h"
+#ifdef CONFIG_MENU
 #include "menu.h"
+#endif
 #include "csprogs.h"
 
 extern qboolean noclip_anglehack;
@@ -417,7 +419,23 @@ extern cvar_t sessionid;
     DP_OS_STR	- "identifier" of the OS, more suited for code to use
     DP_ARCH_STR	- "identifier" of the processor architecture
  */
-#if defined(__linux__)
+#if defined(__ANDROID__) /* must come first because it also defines linux */
+# define DP_OS_NAME		"Android"
+# define DP_OS_STR		"android"
+# define USE_GLES2		1
+# define LINK_TO_ZLIB	1
+# 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 */
+# define DP_OS_NAME		"iPhoneOS"
+# define DP_OS_STR		"iphoneos"
+# define USE_GLES2		1
+# define LINK_TO_ZLIB	1
+# define LINK_TO_LIBVORBIS 1
+# define DP_MOBILETOUCH	1
+# define DP_FREETYPE_STATIC 1
+#elif defined(__linux__)
 # define DP_OS_NAME		"Linux"
 # define DP_OS_STR		"linux"
 #elif defined(_WIN64)
@@ -435,10 +453,6 @@ extern cvar_t sessionid;
 #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
 #elif defined(MACOSX)
 # define DP_OS_NAME		"Mac OS X"
 # define DP_OS_STR		"osx"