From 73fe2183d19eb21a0ca2ba0ec6617d6ed3ec0a74 Mon Sep 17 00:00:00 2001 From: Francois van Niekerk Date: Tue, 24 Jul 2018 18:06:55 +0200 Subject: [PATCH] Fix Windows and iOS compile CFFI issues --- src/lime/system/System.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lime/system/System.hx b/src/lime/system/System.hx index 5485208af..50545cf3b 100644 --- a/src/lime/system/System.hx +++ b/src/lime/system/System.hx @@ -675,7 +675,7 @@ class System { if (__deviceModel == null) { - #if (windows || ios || tvos) + #if (lime_cffi && !macro && (windows || ios || tvos)) #if hl __deviceModel = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_model ()); #else @@ -710,7 +710,7 @@ class System { if (__deviceVendor == null) { - #if (windows && !html5) + #if (lime_cffi && !macro && windows && !html5) #if hl __deviceVendor = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_vendor ()); #else @@ -811,7 +811,7 @@ class System { if (__platformLabel == null) { - #if (windows && !html5) + #if (lime_cffi && !macro && windows && !html5) #if hl var label:String = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_label ()); #else @@ -879,7 +879,7 @@ class System { if (__platformVersion == null) { - #if (windows && !html5) + #if (lime_cffi && !macro && windows && !html5) #if hl __platformVersion = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_version ()); #else @@ -889,7 +889,7 @@ class System { var release = JNI.createStaticField ("android/os/Build$VERSION", "RELEASE", "Ljava/lang/String;").get (); var api = JNI.createStaticField ("android/os/Build$VERSION", "SDK_INT", "I").get (); if (release != null && api != null) __platformVersion = release + " (API " + api + ")"; - #elseif (ios || tvos) + #elseif (lime_cffi && !macro && (ios || tvos)) __platformVersion = NativeCFFI.lime_system_get_platform_version (); #elseif mac __platformVersion = __runProcess ("sw_vers", [ "-productVersion" ]);