Problem: multiple library for mac (fix #332)

update lib, header only one build for mac changelog change location fix
cronos-labs · Jul 26, 2023 · bd813ea · bd813ea
1 parent a43fab1
commit bd813ea
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 28 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,8 +24,9 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
+          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs          
           TARGET=4.27 make
+          rm -Rf ./Source/ThirdParty/PlayCppSdkLibrary/Lib/Mac/arm64
           python change_version.py 4.27.0
           
 
@@ -59,7 +60,7 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
+          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs          
           TARGET=5.0 make
           python change_version.py 5.0.0
           
@@ -94,8 +95,9 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
+          mv ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs          
           TARGET=5.1 make
+          rm -Rf ./Source/ThirdParty/PlayCppSdkLibrary/Lib/Mac/arm64
           python change_version.py 5.1.0
           
 
@@ -129,7 +131,7 @@ jobs:
 
       - name: Prepare PlayCppSdk
         run: |
-          rm ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy
+          rm ./Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs.legacy          
           TARGET=5.2 make
           python change_version.py 5.2.0
           

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [v0.0.14-alpha] - 2023-7-26
+- only one build for mac
+- fix Array bug in abi json
+
 ## [v0.0.13-alpha] - 2023-6-15
 - Support apple arm64
 - Support Unreal Engine 5.2.0

diff --git a/CronosPlayUnreal.uplugin b/CronosPlayUnreal.uplugin
@@ -2,7 +2,7 @@
 	"FileVersion": 3,
 	"FriendlyName": "Cronos Play for Unreal Engine",
 	"Version": 1,
-	"VersionName": "v0.0.13-alpha",
+	"VersionName": "v0.0.14-alpha",
 	"EngineVersion": "5.2.0",
 	"Description": "Cronos labs",
 	"Category": "Programming",

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ UNAME := $(shell uname)
 PWD = $(shell pwd)
 
 # Set the play cpp sdk version
-PLAYCPPSDK=v0.0.21-alpha
+PLAYCPPSDK=v0.0.22-alpha
 # Set the play-cpp-sdk cache path
 PLAYCPPSDK_CACHE_DIR=./install/$(PLAYCPPSDK)
 # Set the play-cpp-sdk target path

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.cc
@@ -325,7 +325,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/contract.rs.h
@@ -325,7 +325,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/core.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/core.cc
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.cc
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/ethereum.rs.h
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/lib.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/lib.rs.h
@@ -369,7 +369,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.cc
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/nft.rs.h
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.cc
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/defi-wallet-core-cpp/src/uint.rs.h
@@ -323,7 +323,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.cc b/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.cc
@@ -372,7 +372,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/extra-cpp-bindings/src/lib.rs.h
@@ -372,7 +372,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/Include/rust/cxx.h b/Source/ThirdParty/PlayCppSdkLibrary/Include/rust/cxx.h
@@ -629,7 +629,8 @@ typename Slice<T>::iterator::difference_type
 Slice<T>::iterator::operator-(const iterator &other) const noexcept {
     auto diff = std::distance(static_cast<char *>(other.pos),
                               static_cast<char *>(this->pos));
-    return diff / this->stride;
+    return diff / static_cast<typename Slice<T>::iterator::difference_type>(
+                      this->stride);
 }
 
 template <typename T>

diff --git a/Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs b/Source/ThirdParty/PlayCppSdkLibrary/PlayCppSdkLibrary.Build.cs
@@ -40,15 +40,8 @@ public PlayCppSdkLibrary(ReadOnlyTargetRules Target) : base(Target) {
             PublicAdditionalLibraries.Add("ws2_32.lib");
 
         } else if (Target.Platform == UnrealTargetPlatform.Mac) {
-            if (Target.Architecture == UnrealArch.X64)
-                PublicAdditionalLibraries.Add(Path.Combine(
-                    LibrariesPath, "Mac/x86_64", "libplay_cpp_sdk.a"));
-            else if (Target.Architecture == UnrealArch.Arm64)
-                PublicAdditionalLibraries.Add(Path.Combine(
-                    LibrariesPath, "Mac/arm64", "libplay_cpp_sdk.a"));
-            else {
-                throw new System.Exception("Unsupported architecture");
-            }
+            PublicAdditionalLibraries.Add(
+                Path.Combine(LibrariesPath, "Mac/arm64", "libplay_cpp_sdk.a"));
         } else if (Target.Platform == UnrealTargetPlatform.Linux) {
             PublicAdditionalLibraries.Add(
                 Path.Combine(LibrariesPath, "Linux", "libplay_cpp_sdk.a"));