Display and control your Android device
Build dependencies from sources
Romain Vimont8d87b91f6929
diff --git a/app/deps/.gitignore b/app/deps/.gitignorenew file mode 100644index 00000000..ccf6a49e--- /dev/null+++ b/app/deps/.gitignore@@ -0,0 +1 @@+/workdiff --git a/app/deps/README b/app/deps/READMEnew file mode 100644index 00000000..9cfb5c06--- /dev/null+++ b/app/deps/README@@ -0,0 +1,27 @@+This directory (app/deps/) contains:++*.sh : shell scripts to download and build dependencies++patches/ : patches to fix dependencies (used by scripts)++work/sources/ : downloaded tarballs and extracted folders+ ffmpeg-6.1.1.tar.xz+ ffmpeg-6.1.1/+ libusb-1.0.27.tar.gz+ libusb-1.0.27/+ ...+work/build/ : build dirs for each dependency/version/architecture+ ffmpeg-6.1.1/win32/+ ffmpeg-6.1.1/win64/+ libusb-1.0.27/win32/+ libusb-1.0.27/win64/+ ...+work/install/ : install dirs for each architexture+ win32/bin/+ win32/include/+ win32/lib/+ win32/share/+ win64/bin/+ win64/include/+ win64/lib/+ win64/share/diff --git a/app/deps/adb.sh b/app/deps/adb.shnew file mode 100755index 00000000..e2408216--- /dev/null+++ b/app/deps/adb.sh@@ -0,0 +1,32 @@+#!/usr/bin/env bash+set -ex+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})+cd "$DEPS_DIR"+. common++VERSION=34.0.5+FILENAME=platform-tools_r$VERSION-windows.zip+PROJECT_DIR=platform-tools-$VERSION+SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571++cd "$SOURCES_DIR"++if [[ -d "$PROJECT_DIR" ]]+then+ echo "$PWD/$PROJECT_DIR" found+else+ get_file "https://dl.google.com/android/repository/$FILENAME" "$FILENAME" "$SHA256SUM"+ mkdir -p "$PROJECT_DIR"+ cd "$PROJECT_DIR"+ ZIP_PREFIX=platform-tools+ unzip "../$FILENAME" \+ "$ZIP_PREFIX"/AdbWinApi.dll \+ "$ZIP_PREFIX"/AdbWinUsbApi.dll \+ "$ZIP_PREFIX"/adb.exe+ mv "$ZIP_PREFIX"/* .+ rmdir "$ZIP_PREFIX"+fi++mkdir -p "$INSTALL_DIR/$HOST/bin"+cd "$INSTALL_DIR/$HOST/bin"+cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/"diff --git a/app/deps/common b/app/deps/commonnew file mode 100644index 00000000..c1cc7729--- /dev/null+++ b/app/deps/common@@ -0,0 +1,55 @@+#!/usr/bin/env bash+# This file is intended to be sourced by other scripts, not executed++if [[ $# != 1 ]]+then+ # <host>: win32 or win64+ echo "Syntax: $0 <host>" >&2+ exit 1+fi++HOST="$1"++if [[ "$HOST" = win32 ]]+then+ HOST_TRIPLET=i686-w64-mingw32+elif [[ "$HOST" = win64 ]]+then+ HOST_TRIPLET=x86_64-w64-mingw32+else+ echo "Unsupported host: $HOST" >&2+ exit 1+fi++DEPS_DIR=$(dirname ${BASH_SOURCE[0]})+cd "$DEPS_DIR"++PATCHES_DIR="$PWD/patches"++WORK_DIR="$PWD/work"+SOURCES_DIR="$WORK_DIR/sources"+BUILD_DIR="$WORK_DIR/build"+INSTALL_DIR="$WORK_DIR/install"++mkdir -p "$INSTALL_DIR" "$SOURCES_DIR" "$WORK_DIR"++checksum() {+ local file="$1"+ local sum="$2"+ echo "$file: verifying checksum..."+ echo "$sum $file" | sha256sum -c+}++get_file() {+ local url="$1"+ local file="$2"+ local sum="$3"+ if [[ -f "$file" ]]+ then+ echo "$file: found"+ else+ echo "$file: not found, downloading..."+ wget "$url" -O "$file"+ fi+ checksum "$file" "$sum"+}diff --git a/app/deps/ffmpeg.sh b/app/deps/ffmpeg.shnew file mode 100755index 00000000..19fb2991--- /dev/null+++ b/app/deps/ffmpeg.sh@@ -0,0 +1,91 @@+#!/usr/bin/env bash+set -ex+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})+cd "$DEPS_DIR"+. common++VERSION=6.1.1+FILENAME=ffmpeg-$VERSION.tar.xz+PROJECT_DIR=ffmpeg-$VERSION+SHA256SUM=8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968++cd "$SOURCES_DIR"++if [[ -d "$PROJECT_DIR" ]]+then+ echo "$PWD/$PROJECT_DIR" found+else+ get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"+ tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"+ patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/ffmpeg-6.1-fix-build.patch+fi++mkdir -p "$BUILD_DIR/$PROJECT_DIR"+cd "$BUILD_DIR/$PROJECT_DIR"++if [[ "$HOST" = win32 ]]+then+ ARCH=x86+elif [[ "$HOST" = win64 ]]+then+ ARCH=x86_64+else+ echo "Unsupported host: $HOST" >&2+ exit 1+fi++# -static-libgcc to avoid missing libgcc_s_dw2-1.dll+# -static to avoid dynamic dependency to zlib+export CFLAGS='-static-libgcc -static'+export CXXFLAGS="$CFLAGS"+export LDFLAGS='-static-libgcc -static'++if [[ -d "$HOST" ]]+then+ echo "'$PWD/$HOST' already exists, not reconfigured"+ cd "$HOST"+else+ mkdir "$HOST"+ cd "$HOST"++ "$SOURCES_DIR/$PROJECT_DIR"/configure \+ --prefix="$INSTALL_DIR/$HOST" \+ --enable-cross-compile \+ --target-os=mingw32 \+ --arch="$ARCH" \+ --cross-prefix="${HOST_TRIPLET}-" \+ --cc="${HOST_TRIPLET}-gcc" \+ --extra-cflags="-O2 -fPIC" \+ --enable-shared \+ --disable-static \+ --disable-programs \+ --disable-doc \+ --disable-swscale \+ --disable-postproc \+ --disable-avfilter \+ --disable-avdevice \+ --disable-network \+ --disable-everything \+ --enable-swresample \+ --enable-decoder=h264 \+ --enable-decoder=hevc \+ --enable-decoder=av1 \+ --enable-decoder=pcm_s16le \+ --enable-decoder=opus \+ --enable-decoder=aac \+ --enable-decoder=flac \+ --enable-decoder=png \+ --enable-protocol=file \+ --enable-demuxer=image2 \+ --enable-parser=png \+ --enable-zlib \+ --enable-muxer=matroska \+ --enable-muxer=mp4 \+ --enable-muxer=opus \+ --enable-muxer=flac \+ --enable-muxer=wav \+ --disable-vulkan+fi++make -j+make installdiff --git a/app/deps/libusb.sh b/app/deps/libusb.shnew file mode 100755index 00000000..97fc3c72--- /dev/null+++ b/app/deps/libusb.sh@@ -0,0 +1,44 @@+#!/usr/bin/env bash+set -ex+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})+cd "$DEPS_DIR"+. common++VERSION=1.0.27+FILENAME=libusb-$VERSION.tar.bz2+PROJECT_DIR=libusb-$VERSION+SHA256SUM=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575++cd "$SOURCES_DIR"++if [[ -d "$PROJECT_DIR" ]]+then+ echo "$PWD/$PROJECT_DIR" found+else+ get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/libusb-$VERSION.tar.bz2" "$FILENAME" "$SHA256SUM"+ tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"+fi++mkdir -p "$BUILD_DIR/$PROJECT_DIR"+cd "$BUILD_DIR/$PROJECT_DIR"++export CFLAGS='-O2'+export CXXFLAGS="$CFLAGS"++if [[ -d "$HOST" ]]+then+ echo "'$PWD/$HOST' already exists, not reconfigured"+ cd "$HOST"+else+ mkdir "$HOST"+ cd "$HOST"++ "$SOURCES_DIR/$PROJECT_DIR"/configure \+ --prefix="$INSTALL_DIR/$HOST" \+ --host="$HOST_TRIPLET" \+ --enable-shared \+ --disable-static+fi++make -j+make install-stripdiff --git a/app/deps/patches/ffmpeg-6.1-fix-build.patch b/app/deps/patches/ffmpeg-6.1-fix-build.patchnew file mode 100644index 00000000..ed4df48d--- /dev/null+++ b/app/deps/patches/ffmpeg-6.1-fix-build.patch@@ -0,0 +1,27 @@+From 03c80197afb324da38c9b70254231e3fdcfa68fc Mon Sep 17 00:00:00 2001+From: Romain Vimont <[email protected]>+Date: Sun, 12 Nov 2023 17:58:50 +0100+Subject: [PATCH] Fix FFmpeg 6.1 build++Build failed on tag n6.1 With --enable-decoder=av1 but without+--enable-muxer=av1.+---+ libavcodec/Makefile | 2 +-+ 1 file changed, 1 insertion(+), 1 deletion(-)++diff --git a/libavcodec/Makefile b/libavcodec/Makefile+index 580a8d6b54..aff19b670c 100644+--- a/libavcodec/Makefile++++ b/libavcodec/Makefile+@@ -249,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER) += atrac3plusdec.o atrac3plus.o \+ OBJS-$(CONFIG_ATRAC9_DECODER) += atrac9dec.o+ OBJS-$(CONFIG_AURA_DECODER) += cyuv.o+ OBJS-$(CONFIG_AURA2_DECODER) += aura.o+-OBJS-$(CONFIG_AV1_DECODER) += av1dec.o++OBJS-$(CONFIG_AV1_DECODER) += av1dec.o av1_parse.o+ OBJS-$(CONFIG_AV1_CUVID_DECODER) += cuviddec.o+ OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER) += mediacodecdec.o+ OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER) += mediacodecenc.o+--+2.42.0+diff --git a/app/deps/sdl.sh b/app/deps/sdl.shnew file mode 100755index 00000000..36c7ab1c--- /dev/null+++ b/app/deps/sdl.sh@@ -0,0 +1,47 @@+#!/usr/bin/env bash+set -ex+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})+cd "$DEPS_DIR"+. common++VERSION=2.28.5+FILENAME=SDL-$VERSION.tar.gz+PROJECT_DIR=SDL-release-$VERSION+SHA256SUM=9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023++cd "$SOURCES_DIR"++if [[ -d "$PROJECT_DIR" ]]+then+ echo "$PWD/$PROJECT_DIR" found+else+ get_file "https://github.com/libsdl-org/SDL/archive/refs/tags/release-$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"+ tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"+fi++mkdir -p "$BUILD_DIR/$PROJECT_DIR"+cd "$BUILD_DIR/$PROJECT_DIR"++export CFLAGS='-O2'+export CXXFLAGS="$CFLAGS"++if [[ -d "$HOST" ]]+then+ echo "'$PWD/$HOST' already exists, not reconfigured"+ cd "$HOST"+else+ mkdir "$HOST"+ cd "$HOST"++ "$SOURCES_DIR/$PROJECT_DIR"/configure \+ --prefix="$INSTALL_DIR/$HOST" \+ --host="$HOST_TRIPLET" \+ --enable-shared \+ --disable-static+fi++make -j+# There is no "make install-strip"+make install+# Strip manually+${HOST_TRIPLET}-strip "$INSTALL_DIR/$HOST/bin/SDL2.dll"diff --git a/app/prebuilt-deps/.gitignore b/app/prebuilt-deps/.gitignoredeleted file mode 100644index 3af0ccb6..00000000--- a/app/prebuilt-deps/.gitignore+++ /dev/null@@ -1 +0,0 @@-/datadiff --git a/app/prebuilt-deps/common b/app/prebuilt-deps/commondeleted file mode 100755index c97f7de4..00000000--- a/app/prebuilt-deps/common+++ /dev/null@@ -1,22 +0,0 @@-PREBUILT_DATA_DIR=data--checksum() {- local file="$1"- local sum="$2"- echo "$file: verifying checksum..."- echo "$sum $file" | sha256sum -c-}--get_file() {- local url="$1"- local file="$2"- local sum="$3"- if [[ -f "$file" ]]- then- echo "$file: found"- else- echo "$file: not found, downloading..."- wget "$url" -O "$file"- fi- checksum "$file" "$sum"-}diff --git a/app/prebuilt-deps/prepare-adb.sh b/app/prebuilt-deps/prepare-adb.shdeleted file mode 100755index 4fb6fd7d..00000000--- a/app/prebuilt-deps/prepare-adb.sh+++ /dev/null@@ -1,32 +0,0 @@-#!/usr/bin/env bash-set -e-DIR=$(dirname ${BASH_SOURCE[0]})-cd "$DIR"-. common-mkdir -p "$PREBUILT_DATA_DIR"-cd "$PREBUILT_DATA_DIR"--DEP_DIR=platform-tools-34.0.5--FILENAME=platform-tools_r34.0.5-windows.zip-SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571--if [[ -d "$DEP_DIR" ]]-then- echo "$DEP_DIR" found- exit 0-fi--get_file "https://dl.google.com/android/repository/$FILENAME" \- "$FILENAME" "$SHA256SUM"--mkdir "$DEP_DIR"-cd "$DEP_DIR"--ZIP_PREFIX=platform-tools-unzip "../$FILENAME" \- "$ZIP_PREFIX"/AdbWinApi.dll \- "$ZIP_PREFIX"/AdbWinUsbApi.dll \- "$ZIP_PREFIX"/adb.exe-mv "$ZIP_PREFIX"/* .-rmdir "$ZIP_PREFIX"diff --git a/app/prebuilt-deps/prepare-ffmpeg.sh b/app/prebuilt-deps/prepare-ffmpeg.shdeleted file mode 100755index 19840afb..00000000--- a/app/prebuilt-deps/prepare-ffmpeg.sh+++ /dev/null@@ -1,30 +0,0 @@-#!/usr/bin/env bash-set -e-DIR=$(dirname ${BASH_SOURCE[0]})-cd "$DIR"-. common-mkdir -p "$PREBUILT_DATA_DIR"-cd "$PREBUILT_DATA_DIR"--VERSION=6.1-scrcpy-3-DEP_DIR="ffmpeg-$VERSION"--FILENAME="$DEP_DIR".7z-SHA256SUM=b646d18a3d543a4e4c46881568213499f22e4454a464e1552f03f2ac9cc3a05a--if [[ -d "$DEP_DIR" ]]-then- echo "$DEP_DIR" found- exit 0-fi--get_file "https://github.com/rom1v/scrcpy-deps/releases/download/$VERSION/$FILENAME" \- "$FILENAME" "$SHA256SUM"--mkdir "$DEP_DIR"-cd "$DEP_DIR"--ZIP_PREFIX=ffmpeg-7z x "../$FILENAME"-mv "$ZIP_PREFIX"/* .-rmdir "$ZIP_PREFIX"diff --git a/app/prebuilt-deps/prepare-libusb.sh b/app/prebuilt-deps/prepare-libusb.shdeleted file mode 100755index b31c45eb..00000000--- a/app/prebuilt-deps/prepare-libusb.sh+++ /dev/null@@ -1,37 +0,0 @@-#!/usr/bin/env bash-set -e-DIR=$(dirname ${BASH_SOURCE[0]})-cd "$DIR"-. common-mkdir -p "$PREBUILT_DATA_DIR"-cd "$PREBUILT_DATA_DIR"--VERSION=1.0.26-DEP_DIR="libusb-$VERSION"--FILENAME="libusb-$VERSION-binaries.7z"-SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5--if [[ -d "$DEP_DIR" ]]-then- echo "$DEP_DIR" found- exit 0-fi--get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/$FILENAME" \- "$FILENAME" "$SHA256SUM"--mkdir "$DEP_DIR"-cd "$DEP_DIR"--7z x "../$FILENAME" \- "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \- "libusb-$VERSION-binaries/libusb-MinGW-x64/"--mv "libusb-$VERSION-binaries/libusb-MinGW-Win32" .-mv "libusb-$VERSION-binaries/libusb-MinGW-x64" .-rm -rf "libusb-$VERSION-binaries"--# Rename the dll to get the same library name on all platforms-mv libusb-MinGW-Win32/bin/msys-usb-1.0.dll libusb-MinGW-Win32/bin/libusb-1.0.dll-mv libusb-MinGW-x64/bin/msys-usb-1.0.dll libusb-MinGW-x64/bin/libusb-1.0.dlldiff --git a/app/prebuilt-deps/prepare-sdl.sh b/app/prebuilt-deps/prepare-sdl.shdeleted file mode 100755index 7569744f..00000000--- a/app/prebuilt-deps/prepare-sdl.sh+++ /dev/null@@ -1,34 +0,0 @@-#!/usr/bin/env bash-set -e-DIR=$(dirname ${BASH_SOURCE[0]})-cd "$DIR"-. common-mkdir -p "$PREBUILT_DATA_DIR"-cd "$PREBUILT_DATA_DIR"--VERSION=2.28.5-DEP_DIR="SDL2-$VERSION"--FILENAME="SDL2-devel-$VERSION-mingw.tar.gz"-SHA256SUM=3c0c655c2ebf67cad48fead72761d1601740ded30808952c3274ba223d226c21--if [[ -d "$DEP_DIR" ]]-then- echo "$DEP_DIR" found- exit 0-fi--get_file "https://github.com/libsdl-org/SDL/releases/download/release-$VERSION/$FILENAME" \- "$FILENAME" "$SHA256SUM"--mkdir "$DEP_DIR"-cd "$DEP_DIR"--TAR_PREFIX="$DEP_DIR" # root directory inside the tar has the same name-tar xf "../$FILENAME" --strip-components=1 \- "$TAR_PREFIX"/i686-w64-mingw32/bin/SDL2.dll \- "$TAR_PREFIX"/i686-w64-mingw32/include/ \- "$TAR_PREFIX"/i686-w64-mingw32/lib/ \- "$TAR_PREFIX"/x86_64-w64-mingw32/bin/SDL2.dll \- "$TAR_PREFIX"/x86_64-w64-mingw32/include/ \- "$TAR_PREFIX"/x86_64-w64-mingw32/lib/ \diff --git a/release.mk b/release.mkindex fd969e5a..89f3da21 100644--- a/release.mk+++ b/release.mk@@ -62,38 +62,38 @@ build-server:meson setup "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )ninja -C "$(SERVER_BUILD_DIR)"-prepare-deps:- @app/prebuilt-deps/prepare-adb.sh- @app/prebuilt-deps/prepare-sdl.sh- @app/prebuilt-deps/prepare-ffmpeg.sh- @app/prebuilt-deps/prepare-libusb.sh--build-win32: prepare-deps+prepare-deps-win32:+ @app/deps/adb.sh win32+ @app/deps/sdl.sh win32+ @app/deps/ffmpeg.sh win32+ @app/deps/libusb.sh win32++prepare-deps-win64:+ @app/deps/adb.sh win64+ @app/deps/sdl.sh win64+ @app/deps/ffmpeg.sh win64+ @app/deps/libusb.sh win64++build-win32: prepare-deps-win32rm -rf "$(WIN32_BUILD_DIR)"mkdir -p "$(WIN32_BUILD_DIR)/local"- cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win32/. "$(WIN32_BUILD_DIR)/local/"- cp -r app/prebuilt-deps/data/SDL2-2.28.5/i686-w64-mingw32/. "$(WIN32_BUILD_DIR)/local/"- cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/. "$(WIN32_BUILD_DIR)/local/"meson setup "$(WIN32_BUILD_DIR)" \- --pkg-config-path="$(WIN32_BUILD_DIR)/local/lib/pkgconfig" \- -Dc_args="-I$(PWD)/$(WIN32_BUILD_DIR)/local/include" \- -Dc_link_args="-L$(PWD)/$(WIN32_BUILD_DIR)/local/lib" \+ --pkg-config-path="app/deps/work/install/win32/lib/pkgconfig" \+ -Dc_args="-I$(PWD)/app/deps/work/install/win32/include" \+ -Dc_link_args="-L$(PWD)/app/deps/work/install/win32/lib" \--cross-file=cross_win32.txt \--buildtype=release --strip -Db_lto=true \-Dcompile_server=false \-Dportable=trueninja -C "$(WIN32_BUILD_DIR)"-build-win64: prepare-deps+build-win64: prepare-deps-win64rm -rf "$(WIN64_BUILD_DIR)"mkdir -p "$(WIN64_BUILD_DIR)/local"- cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win64/. "$(WIN64_BUILD_DIR)/local/"- cp -r app/prebuilt-deps/data/SDL2-2.28.5/x86_64-w64-mingw32/. "$(WIN64_BUILD_DIR)/local/"- cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/. "$(WIN64_BUILD_DIR)/local/"meson setup "$(WIN64_BUILD_DIR)" \- --pkg-config-path="$(WIN64_BUILD_DIR)/local/lib/pkgconfig" \- -Dc_args="-I$(PWD)/$(WIN64_BUILD_DIR)/local/include" \- -Dc_link_args="-L$(PWD)/$(WIN64_BUILD_DIR)/local/lib" \+ --pkg-config-path="app/deps/work/install/win64/lib/pkgconfig" \+ -Dc_args="-I$(PWD)/app/deps/work/install/win64/include" \+ -Dc_link_args="-L$(PWD)/app/deps/work/install/win64/lib" \--cross-file=cross_win64.txt \--buildtype=release --strip -Db_lto=true \-Dcompile_server=false \@@ -108,10 +108,8 @@ dist-win32: build-server build-win32cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)/"cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)/"cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp "$(WIN32_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/deps/work/install/win32/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/deps/work/install/win32/bin/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"dist-win64: build-server build-win64mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"@@ -121,10 +119,8 @@ dist-win64: build-server build-win64cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)/"cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)/"cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp "$(WIN64_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/deps/work/install/win64/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/deps/work/install/win64/bin/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"zip-win32: dist-win32cd "$(DIST)"; \