Problem: missing universal library for mac arm64, x86_64 (fix #460) (#…

…461)

Solution: add universal binary

fix typo

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 ## [Unreleased]
 
+## [v0.0.23-alpha] - 2023-8-7
+- add mac universal binary (arm64 + x86_64)
+
 ## [v0.0.22-alpha] - 2023-7-26
 - fix Array in abi json encoding
 ## [v0.0.21-alpha] - 2023-6-12

Makefile

@@ -54,27 +54,27 @@ clone:
 build_play-cpp-sdk: clone
 ifeq ($(shell uname -m), x86_64)
  ifeq ($(UNAME), Darwin)		
-  ifeq ($(USE_ARM64),true)
+	cargo install cargo-lipo
 	rustup target add aarch64-apple-darwin
-	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release --target aarch64-apple-darwin
-  else
 	rustup target add x86_64-apple-darwin
-	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release
-  endif		
+	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release --target aarch64-apple-darwin
+	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release		
+	lipo -create -output  ./target/release/libplay_cpp_sdk_universal.a ./target/release/libplay_cpp_sdk.a ./target/aarch64-apple-darwin/release/libplay_cpp_sdk.a
+	lipo -create -output  ./target/aarch64-apple-darwin/release/libplay_cpp_sdk_universal.a ./target/release/libplay_cpp_sdk.a ./target/aarch64-apple-darwin/release/libplay_cpp_sdk.a
  endif
  ifeq ($(UNAME), Linux)
 	CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release
  endif
 else 
  ifeq ($(shell uname -m), arm64)
   ifeq ($(UNAME), Darwin)
-   ifeq ($(USE_ARM64), true)
+	cargo install cargo-lipo
 	rustup target add aarch64-apple-darwin
-	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release
-   else
 	rustup target add x86_64-apple-darwin
+	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release
 	MACOSX_DEPLOYMENT_TARGET=10.15 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release --target x86_64-apple-darwin
-   endif
+	lipo -create -output  ./target/release/libplay_cpp_sdk_universal.a ./target/release/libplay_cpp_sdk.a ./target/x86_64-apple-darwin/release/libplay_cpp_sdk.a
+	lipo -create -output  ./target/x86_64-apple-darwin/release/libplay_cpp_sdk_universal.a ./target/release/libplay_cpp_sdk.a ./target/x86_64-apple-darwin/release/libplay_cpp_sdk.a
   endif
  else
 	CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) cargo build --package play-cpp-sdk --release

play-cpp-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "play-cpp-sdk"
-version = "0.0.22-alpha"
+version = "0.0.23-alpha"
 edition = "2021"
 license = "Apache-2.0"