diff --git a/electron-builder.json b/electron-builder.json index b711ce57..81d047ee 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -13,25 +13,13 @@ { "target": "nsis", "arch": ["x64", "arm64"] - }, - { - "target": "zip", - "arch": ["x64", "arm64"] - }, - { - "target": "portable", - "arch": ["x64", "arm64"] - }, - { - "target": "appx", - "arch": ["x64", "arm64"] } ], "artifactName": "${productName}-${version}-win-${arch}.${ext}", "extraResources": { "from": "electron/resources/extra", "to": "extra", - "filter": ["common", "win"] + "filter": ["common", "win", "win-${arch}"] } }, "nsis": { @@ -65,7 +53,7 @@ "extraResources": { "from": "electron/resources/extra", "to": "extra", - "filter": ["common", "mac"] + "filter": ["common", "mac", "mac-${arch}"] }, "x64ArchFiles": "Contents/Resources/extra/**/*", "entitlementsInherit": "entitlements.mac.plist", @@ -96,7 +84,7 @@ "extraResources": { "from": "electron/resources/extra", "to": "extra", - "filter": ["common", "linux"] + "filter": ["common", "linux", "linux-${arch}", "linux-${target}"] } }, "asar": true, diff --git a/electron/configs/scrcpy/index.js b/electron/configs/scrcpy/index.js index 788aa653..52753176 100644 --- a/electron/configs/scrcpy/index.js +++ b/electron/configs/scrcpy/index.js @@ -5,8 +5,8 @@ export const getScrcpyPath = () => { switch (process.platform) { case 'win32': return extraResolve('win/scrcpy/scrcpy.exe') - // case 'darwin': - // return extraResolve('mac/scrcpy/scrcpy') + case 'darwin': + return extraResolve(`mac-${process.arch}/scrcpy/scrcpy`) // case 'linux': // return extraResolve('linux/scrcpy/scrcpy') default: diff --git a/electron/resources/extra/mac-arm64/scrcpy/adb b/electron/resources/extra/mac-arm64/scrcpy/adb new file mode 100755 index 00000000..6abdd141 Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/adb differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/icon.png b/electron/resources/extra/mac-arm64/scrcpy/icon.png new file mode 100755 index 00000000..22bb69ff Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/icon.png differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libSDL2-2.0.0.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libSDL2-2.0.0.dylib new file mode 100755 index 00000000..7ed42087 Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libSDL2-2.0.0.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libavcodec.61.3.100.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libavcodec.61.3.100.dylib new file mode 100755 index 00000000..a089688c Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libavcodec.61.3.100.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libavformat.61.1.100.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libavformat.61.1.100.dylib new file mode 100755 index 00000000..dfa3b03c Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libavformat.61.1.100.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libavutil.59.8.100.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libavutil.59.8.100.dylib new file mode 100755 index 00000000..77eb96a2 Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libavutil.59.8.100.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libswresample.5.1.100.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libswresample.5.1.100.dylib new file mode 100755 index 00000000..14035a5e Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libswresample.5.1.100.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/libs/libusb-1.0.0.dylib b/electron/resources/extra/mac-arm64/scrcpy/libs/libusb-1.0.0.dylib new file mode 100755 index 00000000..5a9b0275 Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/libs/libusb-1.0.0.dylib differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/scrcpy b/electron/resources/extra/mac-arm64/scrcpy/scrcpy new file mode 100755 index 00000000..f2ce649c Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/scrcpy differ diff --git a/electron/resources/extra/mac-arm64/scrcpy/scrcpy-server b/electron/resources/extra/mac-arm64/scrcpy/scrcpy-server new file mode 100755 index 00000000..fe6713c8 Binary files /dev/null and b/electron/resources/extra/mac-arm64/scrcpy/scrcpy-server differ diff --git a/electron/resources/extra/mac-x64/scrcpy/adb b/electron/resources/extra/mac-x64/scrcpy/adb new file mode 100755 index 00000000..f912d620 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/adb differ diff --git a/electron/resources/extra/mac-x64/scrcpy/icon.png b/electron/resources/extra/mac-x64/scrcpy/icon.png new file mode 100755 index 00000000..22bb69ff Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/icon.png differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libSDL2-2.0.0.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libSDL2-2.0.0.dylib new file mode 100755 index 00000000..c6d0fd06 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libSDL2-2.0.0.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libavcodec.61.3.100.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libavcodec.61.3.100.dylib new file mode 100755 index 00000000..4b1aeb27 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libavcodec.61.3.100.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libavformat.61.1.100.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libavformat.61.1.100.dylib new file mode 100755 index 00000000..1327b8de Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libavformat.61.1.100.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libavutil.59.8.100.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libavutil.59.8.100.dylib new file mode 100755 index 00000000..011da3fd Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libavutil.59.8.100.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libswresample.5.1.100.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libswresample.5.1.100.dylib new file mode 100755 index 00000000..30f2927a Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libswresample.5.1.100.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/libs/libusb-1.0.0.dylib b/electron/resources/extra/mac-x64/scrcpy/libs/libusb-1.0.0.dylib new file mode 100755 index 00000000..e78f09b3 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/libs/libusb-1.0.0.dylib differ diff --git a/electron/resources/extra/mac-x64/scrcpy/scrcpy b/electron/resources/extra/mac-x64/scrcpy/scrcpy new file mode 100755 index 00000000..4fdab6a4 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/scrcpy differ diff --git a/electron/resources/extra/mac-x64/scrcpy/scrcpy-server b/electron/resources/extra/mac-x64/scrcpy/scrcpy-server new file mode 100755 index 00000000..fe6713c8 Binary files /dev/null and b/electron/resources/extra/mac-x64/scrcpy/scrcpy-server differ diff --git a/electron/resources/extra/win/scrcpy/SDL2.dll b/electron/resources/extra/win/scrcpy/SDL2.dll index 4a11b841..c053b397 100755 Binary files a/electron/resources/extra/win/scrcpy/SDL2.dll and b/electron/resources/extra/win/scrcpy/SDL2.dll differ diff --git a/electron/resources/extra/win/scrcpy/avcodec-61.dll b/electron/resources/extra/win/scrcpy/avcodec-61.dll index 547b2000..76cd3364 100755 Binary files a/electron/resources/extra/win/scrcpy/avcodec-61.dll and b/electron/resources/extra/win/scrcpy/avcodec-61.dll differ diff --git a/electron/resources/extra/win/scrcpy/avformat-61.dll b/electron/resources/extra/win/scrcpy/avformat-61.dll index 17fb0ab9..7025100c 100755 Binary files a/electron/resources/extra/win/scrcpy/avformat-61.dll and b/electron/resources/extra/win/scrcpy/avformat-61.dll differ diff --git a/electron/resources/extra/win/scrcpy/avutil-59.dll b/electron/resources/extra/win/scrcpy/avutil-59.dll index 87f09401..1153e486 100755 Binary files a/electron/resources/extra/win/scrcpy/avutil-59.dll and b/electron/resources/extra/win/scrcpy/avutil-59.dll differ diff --git a/electron/resources/extra/win/scrcpy/libusb-1.0.dll b/electron/resources/extra/win/scrcpy/libusb-1.0.dll index 2ec797bd..557ce281 100755 Binary files a/electron/resources/extra/win/scrcpy/libusb-1.0.dll and b/electron/resources/extra/win/scrcpy/libusb-1.0.dll differ diff --git a/electron/resources/extra/win/scrcpy/scrcpy-server b/electron/resources/extra/win/scrcpy/scrcpy-server index 7a0f71c8..a8709d07 100755 Binary files a/electron/resources/extra/win/scrcpy/scrcpy-server and b/electron/resources/extra/win/scrcpy/scrcpy-server differ diff --git a/electron/resources/extra/win/scrcpy/scrcpy.exe b/electron/resources/extra/win/scrcpy/scrcpy.exe index e2077d72..1348c0e9 100755 Binary files a/electron/resources/extra/win/scrcpy/scrcpy.exe and b/electron/resources/extra/win/scrcpy/scrcpy.exe differ diff --git a/electron/resources/extra/win/scrcpy/swresample-5.dll b/electron/resources/extra/win/scrcpy/swresample-5.dll index 5324d32a..ec1ba39d 100755 Binary files a/electron/resources/extra/win/scrcpy/swresample-5.dll and b/electron/resources/extra/win/scrcpy/swresample-5.dll differ