From 8b2165545817b395bb8fb257dcd6547f6901ec53 Mon Sep 17 00:00:00 2001 From: Eric Betts Date: Thu, 27 Jan 2022 16:46:49 -0800 Subject: [PATCH] preprocessor macros for iOS --- client/deps/liblua/luaconf.h | 9 +++++++++ client/src/util_darwin.m | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/client/deps/liblua/luaconf.h b/client/deps/liblua/luaconf.h index 676f91755..c680f389a 100644 --- a/client/deps/liblua/luaconf.h +++ b/client/deps/liblua/luaconf.h @@ -8,6 +8,15 @@ #ifndef lconfig_h #define lconfig_h +#if defined(__APPLE__) + #include "TargetConditionals.h" + #if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_TV + #define system(s) ((s)==NULL ? 0 : -1) + #endif // end iOS +#elif defined(__ANDROID__) + #define system(s) ((s)==NULL ? 0 : -1) +#endif + #include #include diff --git a/client/src/util_darwin.m b/client/src/util_darwin.m index f2d45fe56..d5107c2fc 100644 --- a/client/src/util_darwin.m +++ b/client/src/util_darwin.m @@ -20,7 +20,12 @@ #import #import + +#if TARGET_OS_IOS +#import +#else #import +#endif static id activity = nil; @@ -49,8 +54,11 @@ void enableAppNap() { } #endif +#if TARGET_OS_IOS +void makeUnfocusable() { } +void makeFocusable() { } //OS X Version 10.6 is defined in OS X 10.6 and later -#if defined(MAC_OS_X_VERSION_10_6) +#elif defined(MAC_OS_X_VERSION_10_6) void makeUnfocusable() { [NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited]; }