kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows and iOS compile CFFI issues

Browse Source
This commit is contained in:
Francois van Niekerk
2018-07-24 18:06:55 +02:00
committed by Joshua Granick
parent 0d6b0a1868
commit 73fe2183d1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lime/system/System.hx
View File

@@ -675,7 +675,7 @@ class System {
if (__deviceModel == null) { if (__deviceModel == null) {
#if (windows || ios || tvos) #if (lime_cffi && !macro && (windows || ios || tvos))
#if hl #if hl
__deviceModel = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_model ()); __deviceModel = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_model ());
#else #else
@@ -710,7 +710,7 @@ class System {
if (__deviceVendor == null) { if (__deviceVendor == null) {
#if (windows && !html5) #if (lime_cffi && !macro && windows && !html5)
#if hl #if hl
__deviceVendor = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_vendor ()); __deviceVendor = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_device_vendor ());
#else #else
@@ -811,7 +811,7 @@ class System {
if (__platformLabel == null) { if (__platformLabel == null) {
#if (windows && !html5) #if (lime_cffi && !macro && windows && !html5)
#if hl #if hl
var label:String = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_label ()); var label:String = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_label ());
#else #else
@@ -879,7 +879,7 @@ class System {
if (__platformVersion == null) { if (__platformVersion == null) {
#if (windows && !html5) #if (lime_cffi && !macro && windows && !html5)
#if hl #if hl
__platformVersion = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_version ()); __platformVersion = @:privateAccess String.fromUTF8 (NativeCFFI.lime_system_get_platform_version ());
#else #else
@@ -889,7 +889,7 @@ class System {
var release = JNI.createStaticField ("android/os/Build$VERSION", "RELEASE", "Ljava/lang/String;").get (); 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 (); var api = JNI.createStaticField ("android/os/Build$VERSION", "SDK_INT", "I").get ();
if (release != null && api != null) __platformVersion = release + " (API " + api + ")"; 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 (); __platformVersion = NativeCFFI.lime_system_get_platform_version ();
#elseif mac #elseif mac
__platformVersion = __runProcess ("sw_vers", [ "-productVersion" ]); __platformVersion = __runProcess ("sw_vers", [ "-productVersion" ]);