From 09c3f2892d57d99a2112e93c6b0e2e6f439436c8 Mon Sep 17 00:00:00 2001 From: atraczyk <andreastraczyk@gmail.com> Date: Wed, 25 Oct 2017 18:37:25 -0400 Subject: [PATCH] ios-build: use the macros in TargetConditionals.h - Replaces the TARGET_OS_IOS(seems not used) with macros defined in TargetConditionals.h to correctly determine platform target. - This only replaces the macro in urlhook.cpp preventing the use of the system function, which is critical to the iOS build. Change-Id: I4ba40aefe212bf1279a4813d1cdc2d14ddbd4273 Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> --- src/hooks/urlhook.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hooks/urlhook.cpp b/src/hooks/urlhook.cpp index 1cd18fb503..7940de535e 100644 --- a/src/hooks/urlhook.cpp +++ b/src/hooks/urlhook.cpp @@ -29,7 +29,12 @@ int UrlHook::runAction(const std::string &command, const std::string &args) const std::string cmd = command + (args.empty() ? "" : " ") + "\"" + args + "\" &"; -#if defined(RING_UWP) || defined(TARGET_OS_IOS) +#if __APPLE__ + #include "TargetConditionals.h" + #if defined(TARGET_IPHONE_SIMULATOR) || defined(TARGET_OS_IPHONE) + return 0; + #endif +#elif defined(RING_UWP) return 0; #else return system(cmd.c_str()); -- GitLab