Merge branch 'feat/macos-x64' into android-mac

krazyjakee · krazyjakee · commit ddef05cf555d · 2026-03-04T13:46:13.000Z
# Conflicts:
#	CMakeLists.txt
#	build.sh
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -54,6 +54,10 @@ jobs:
             name: macos-arm64
             build_cmd: ./build.sh release-examples
             build_dir: build-release
+          - os: macos-latest
+            name: macos-x64
+            build_cmd: ./build.sh release-examples --macos-arch x86_64
+            build_dir: build-release
           - os: windows-latest
             name: windows-x64
             build_cmd: .\build.cmd release-examples
@@ -126,6 +130,10 @@ jobs:
       - name: Install Rust (stable)
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Install Rust cross-compilation target
+        if: matrix.name == 'macos-x64'
+        run: rustup target add x86_64-apple-darwin
+
       # ---------- Cache Cargo ----------
       - name: Cache Cargo registry
         uses: actions/cache@v4
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -33,6 +33,9 @@ jobs:
           - os: macos-latest
             name: macos-arm64
             generator: Ninja
+          - os: macos-latest
+            name: macos-x64
+            generator: Ninja
           - os: windows-latest
             name: windows-x64
             generator: "Visual Studio 17 2022"
@@ -125,6 +128,10 @@ jobs:
       - name: Install Rust (stable)
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Install Rust cross-compilation target
+        if: matrix.name == 'macos-x64'
+        run: rustup target add x86_64-apple-darwin
+
       # ---------- Cache Cargo ----------
       - name: Cache Cargo registry
         uses: actions/cache@v4
@@ -162,7 +169,11 @@ jobs:
             exit 1
           fi
 
-          ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir"
+          if [[ "${{ matrix.name }}" == "macos-x64" ]]; then
+            ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir" --macos-arch x86_64
+          else
+            ./build.sh release-examples --version "$version" --bundle --prefix "$bundleDir"
+          fi
 
           # List bundle contents
           echo "Bundle contents:"
@@ -258,7 +269,7 @@ jobs:
           ls -la
           
           # Create tar.gz for Linux and macOS
-          for platform in linux-x64 linux-arm64 macos-arm64; do
+          for platform in linux-x64 linux-arm64 macos-arm64 macos-x64; do
             dirName="livekit-sdk-${platform}-${VERSION}"
             if [[ -d "${dirName}" ]]; then
               echo "Creating archive for ${platform}..."
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,7 +163,7 @@ find_program(CARGO_EXECUTABLE NAMES cargo REQUIRED)
 
 set(RUST_ROOT ${LIVEKIT_ROOT_DIR}/client-sdk-rust)
 
-# Detect Rust target triple for cross-compilation (e.g., Android NDK)
+# Detect Rust target triple for cross-compilation
 set(RUST_TARGET_TRIPLE "")
 if(ANDROID)
   if(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
@@ -173,6 +173,12 @@ if(ANDROID)
   elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
     set(RUST_TARGET_TRIPLE "x86_64-linux-android")
   endif()
+elseif(APPLE AND CMAKE_OSX_ARCHITECTURES)
+  if(CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
+    set(RUST_TARGET_TRIPLE "x86_64-apple-darwin")
+  elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
+    set(RUST_TARGET_TRIPLE "aarch64-apple-darwin")
+  endif()
 endif()
 
 if(RUST_TARGET_TRIPLE)
@@ -426,9 +432,9 @@ if(LIVEKIT_IS_TOPLEVEL)
     add_custom_command(
       TARGET livekit POST_BUILD
       COMMAND /usr/bin/install_name_tool
-              -change "${RUST_ROOT}/target/release/deps/liblivekit_ffi.dylib"
+              -change "${RUST_TARGET_DIR}/release/deps/liblivekit_ffi.dylib"
                       "@rpath/liblivekit_ffi.dylib"
-              -change "${RUST_ROOT}/target/debug/deps/liblivekit_ffi.dylib"
+              -change "${RUST_TARGET_DIR}/debug/deps/liblivekit_ffi.dylib"
                       "@rpath/liblivekit_ffi.dylib"
               "$<TARGET_FILE:livekit>"
       COMMENT "Fix dependency path in liblivekit.dylib -> liblivekit_ffi.dylib"
diff --git a/build.sh b/build.sh
@@ -181,6 +181,10 @@ configure() {
   if [[ -n "${ANDROID_PLATFORM}" ]]; then
     extra_args+=("-DCMAKE_ANDROID_PLATFORM=${ANDROID_PLATFORM}")
   fi
+  if [[ -n "${MACOS_ARCH}" ]]; then
+    echo "==> Setting CMAKE_OSX_ARCHITECTURES=${MACOS_ARCH}"
+    extra_args+=("-DCMAKE_OSX_ARCHITECTURES=${MACOS_ARCH}")
+  fi
   if ((${#extra_args[@]})); then
     if ! cmake --preset "${PRESET}" "${extra_args[@]}"; then
       echo "Warning: CMake preset '${PRESET}' failed. Falling back to traditional configure..."
