zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the macros used for distinguishing between OS X and iOS.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4942 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-01-25 12:16:10 +00:00
parent 36291f2e30
commit 6048f9d766
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/build/include/compat.h
View file

@ -80,17 +80,18 @@
#ifdef __APPLE__ #ifdef __APPLE__
# include <TargetConditionals.h> # include <TargetConditionals.h>
# if !TARGET_OS_IPHONE # if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
# define EDUKE32_IOS
# else
# define EDUKE32_OSX
# if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 # if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
# include <CoreFoundation/CoreFoundation.h> # include <CoreFoundation/CoreFoundation.h>
# endif # endif
# include <CoreServices/CoreServices.h> # include <CoreServices/CoreServices.h>
# else
# define EDUKE32_TOUCH_DEVICES
# endif # endif
#endif #endif
#ifdef __ANDROID__ #if defined __ANDROID__ || defined EDUKE32_IOS
# define EDUKE32_TOUCH_DEVICES # define EDUKE32_TOUCH_DEVICES
#endif #endif

4
polymer/eduke32/build/src/sdlayer.c
View file

@ -161,7 +161,7 @@ int32_t wm_msgbox(const char *name, const char *fmt, ...)
vsnprintf(buf,sizeof(buf),fmt,va); vsnprintf(buf,sizeof(buf),fmt,va);
va_end(va); va_end(va);
#if defined(__APPLE__) && !TARGET_OS_IPHONE #if defined EDUKE32_OSX
return osx_msgbox(name, buf); return osx_msgbox(name, buf);
#elif defined HAVE_GTK2 #elif defined HAVE_GTK2
if (gtkbuild_msgbox(name, buf) >= 0) return 1; if (gtkbuild_msgbox(name, buf) >= 0) return 1;
@ -206,7 +206,7 @@ int32_t wm_ynbox(const char *name, const char *fmt, ...)
vsprintf(buf,fmt,va); vsprintf(buf,fmt,va);
va_end(va); va_end(va);
#if defined __APPLE__ && !TARGET_OS_IPHONE #if defined EDUKE32_OSX
return osx_ynbox(name, buf); return osx_ynbox(name, buf);
#elif defined HAVE_GTK2 #elif defined HAVE_GTK2
{ {

4
polymer/eduke32/source/menus.c
View file

@ -1867,7 +1867,7 @@ static void M_PreMenuDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
"to upgrade to the full registered\n" "to upgrade to the full registered\n"
"version of Duke Nukem 3D."); "version of Duke Nukem 3D.");
#else #else
# if defined __APPLE__ && TARGET_OS_IPHONE # if defined EDUKE32_IOS
mgametextcenter(origin.x, origin.y + (121<<16), "Please visit the App Store\n" mgametextcenter(origin.x, origin.y + (121<<16), "Please visit the App Store\n"
"to upgrade to the full registered\n" "to upgrade to the full registered\n"
"version of Duke Nukem 3D."); "version of Duke Nukem 3D.");
@ -2022,7 +2022,7 @@ static void M_PreMenuDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8); creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8);
#ifdef DROIDMENU #ifdef DROIDMENU
# if defined __APPLE__ && TARGET_OS_IPHONE # if defined EDUKE32_IOS
mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "iOS support programming"); mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "iOS support programming");
# else # else
mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "Android support programming"); mgametextcenter(origin.x, origin.y + ((110+7-l)<<16), "Android support programming");