feat: compiling for ios ok but crash

dojoengine · Jan 26, 2024 · 57a9896 · 57a9896
1 parent c5543c1
commit 57a9896
Show file tree

Hide file tree

Showing 19 changed files with 199 additions and 19 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
diff --git a/Assets/Dojo/.DS_Store b/Assets/Dojo/.DS_Store
diff --git a/Assets/Dojo/Plugins/Linux/libdojo_c.so b/Assets/Dojo/Plugins/Linux/libdojo_c.so
diff --git a/Assets/Dojo/Plugins/Linux/libdojo_c.so.meta b/Assets/Dojo/Plugins/Linux/libdojo_c.so.meta
diff --git a/Assets/Dojo/Plugins/Windows/libdojo_c.dll b/Assets/Dojo/Plugins/Windows/libdojo_c.dll
diff --git a/Assets/Dojo/Plugins/Windows/libdojo_c.dll.meta b/Assets/Dojo/Plugins/Windows/libdojo_c.dll.meta
diff --git a/Assets/Dojo/Plugins/iOS/libdojo_c.a b/Assets/Dojo/Plugins/iOS/libdojo_c.a
diff --git a/Assets/Dojo/Plugins/iOS/libdojo_c.a.meta b/Assets/Dojo/Plugins/iOS/libdojo_c.a.meta
diff --git a/Assets/Dojo/Plugins/iOS/libdojo_c.dylib b/Assets/Dojo/Plugins/iOS/libdojo_c.dylib
diff --git a/Assets/Dojo/Plugins/iOS/libdojo_c.dylib.meta b/Assets/Dojo/Plugins/iOS/libdojo_c.dylib.meta
diff --git a/Assets/Dojo/Plugins/macOS/libdojo_c.bundle b/Assets/Dojo/Plugins/macOS/libdojo_c.bundle
diff --git a/Assets/Dojo/Runtime/Starknet/StarknetInterop.cs b/Assets/Dojo/Runtime/Starknet/StarknetInterop.cs
@@ -1,3 +1,4 @@
+#if UNITY_WEBGL && !UNITY_EDITOR
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -116,4 +117,5 @@ public static Task<bool> WaitForTransactionAsync(IntPtr provider, FieldElement t
         [DllImport("__Internal")]
         public static extern bool Verify(CString publicKey, CString hash, CString r, CString s);
     }
-}
+}
+#endif
diff --git a/Assets/Dojo/Runtime/Torii/ToriiClient.cs b/Assets/Dojo/Runtime/Torii/ToriiClient.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using bottlenoselabs.C2CS.Runtime;
-using UnityEngine;
 using dojo_bindings;
-using JetBrains.Annotations;
 using Dojo.Starknet;
-using UnityEditor.AppleTV;
 namespace Dojo.Torii
 {
     public unsafe class ToriiClient

diff --git a/Assets/Dojo/Runtime/Torii/ToriiWasmClient.cs b/Assets/Dojo/Runtime/Torii/ToriiWasmClient.cs
@@ -1,3 +1,4 @@
+#if UNITY_WEBGL && !UNITY_EDITOR
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,4 +36,5 @@ public async Task<List<Entity>> Entities(int limit, int offset)
             return entities;
         }
     }
-}
+}
+#endif
diff --git a/Assets/Dojo/Runtime/Torii/ToriiWasmInterop.cs b/Assets/Dojo/Runtime/Torii/ToriiWasmInterop.cs
@@ -14,11 +14,13 @@
 namespace Dojo.Torii
 {
     [System.Serializable]
-    public struct WasmValue {
+    public struct WasmValue
+    {
         public string type;
         public JToken value;
     }
 
+#if UNITY_WEBGL && !UNITY_EDITOR
     public class ToriiWasmInterop : MonoBehaviour
     {
         // Creates a new client and returns the pointer to it
@@ -136,4 +138,5 @@ public static void OnEntityUpdated(IntPtr clientPtr, FieldElement[] ids)
         [DllImport("__Internal")]
         public static extern void OnSyncModelChange(IntPtr clientPtr, string model, string callbackObjectName, string callbackMethodName);
     }
+#endif
 }
diff --git a/Assets/Dojo/Runtime/WorldManager.cs b/Assets/Dojo/Runtime/WorldManager.cs
@@ -17,7 +17,9 @@ public class WorldManager : MonoBehaviour
         public string worldAddress;
         public SynchronizationMaster synchronizationMaster;
         public ToriiClient toriiClient;
+        #if UNITY_WEBGL && !UNITY_EDITOR
         public ToriiWasmClient wasmClient;
+        #endif
 
         async void Awake()
         {

diff --git a/Assets/Dojo/Runtime/bindings/client/dojo.gen.cs b/Assets/Dojo/Runtime/bindings/client/dojo.gen.cs
@@ -25,7 +25,11 @@ namespace dojo_bindings
 
     public static unsafe partial class dojo
     {
+        #if UNITY_IPHONE && !UNITY_EDITOR
+        private const string LibraryName = "__Internal";
+        #else
         private const string LibraryName = "dojo_c";
+        #endif
 
         #region API
 

diff --git a/Scripts/libgen.sh b/Scripts/libgen.sh
@@ -48,4 +48,5 @@ lipo -create -output "../../Assets/Dojo/Plugins/macOS/libdojo_c.bundle" \
 
 # iOS
 mkdir -p "../../Assets/Dojo/Plugins/iOS"
-cp -f "target/aarch64-apple-ios/$build/libdojo_c.a" "../../Assets/Dojo/Plugins/iOS/libdojo_c.a"
+cp -f "target/aarch64-apple-ios/$build/libdojo_c.dylib" "../../Assets/Dojo/Plugins/iOS/libdojo_c.dylib"
+cp -f "target/aarch64-apple-ios/$build/libdojo_c.dylib" "../../Assets/Dojo/Plugins/iOS/libdojo_c.a"