From c00825b69e76f97ad926020b8d6cebea897e68fc Mon Sep 17 00:00:00 2001
From: Hatton <hattonjohn@gmail.com>
Date: Sat, 15 Jun 2024 10:06:20 -0600
Subject: [PATCH] build for both intel and arm macs

---
 electron-builder.json5 | 17 ++++++++++++++---
 package.json           |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/electron-builder.json5 b/electron-builder.json5
index 21ffc41d..c01ceaa0 100644
--- a/electron-builder.json5
+++ b/electron-builder.json5
@@ -60,14 +60,25 @@
     artifactName: "${productName} Windows Setup ${version}.${ext}"
   },
   mac: {
-    target: "dmg",
+    mergeASARs: true,
+    target: { target: "default", arch: ["universal"] },
     icon: "build/mac.icns",
     hardenedRuntime: true,
     artifactName: "${productName}-mac-${version}.${ext}",
     extraResources: [
-      "node_modules/ffprobe-static/bin/darwin/x64",
-      "node_modules/ffprobe-static/bin/darwin/arm64"
+      {
+        from: "node_modules/ffprobe-static/bin/darwin/x64",
+        to: "Resources/ffprobe/x64",
+        filter: ["**"]
+      },
+      {
+        from: "node_modules/ffprobe-static/bin/darwin/arm64",
+        to: "Resources/ffprobe/arm64",
+        filter: ["**"]
+      }
     ],
+    x64ArchFiles: "Resources/ffprobe/x64/**",
+
     fileAssociations: [
       {
         ext: "sprj",
diff --git a/package.json b/package.json
index 5dcc6ec0..7229ceb6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "main": "dist/src/mainProcess/main.js",
   "name": "lameta",
   "productName": "lameta",
-  "version": "2.3.5-beta",
+  "version": "2.3.6-beta",
   "author": {
     "name": "lameta",
     "email": "sorryno@email.org"