Display and control your Android device
Use "meson setup"
Romain Vimont64821466a1dd
diff --git a/BUILD.md b/BUILD.mdindex 1d5d970b..e3a2a56b 100644--- a/BUILD.md+++ b/BUILD.md@@ -260,7 +260,7 @@ set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdkThen, build:```bash-meson x --buildtype=release --strip -Db_lto=true+meson setup x --buildtype=release --strip -Db_lto=trueninja -Cx # DO NOT RUN AS ROOT```@@ -281,7 +281,7 @@ Download the prebuilt server somewhere, and specify its path during the Mesonconfiguration:```bash-meson x --buildtype=release --strip -Db_lto=true \+meson setup x --buildtype=release --strip -Db_lto=true \-Dprebuilt_server=/path/to/scrcpy-serverninja -Cx # DO NOT RUN AS ROOT```diff --git a/DEVELOP.md b/DEVELOP.mdindex d200c3fd..bd409fff 100644--- a/DEVELOP.md+++ b/DEVELOP.md@@ -277,7 +277,7 @@ The server is pushed to the device by the client on startup.To debug it, enable the server debugger during configuration:```bash-meson x -Dserver_debugger=true+meson setup x -Dserver_debugger=true# or, if x is already configuredmeson configure x -Dserver_debugger=true```@@ -286,7 +286,7 @@ If your device runs Android 8 or below, set the `server_debugger_method` to`old` in addition:```bash-meson x -Dserver_debugger=true -Dserver_debugger_method=old+meson setup x -Dserver_debugger=true -Dserver_debugger_method=old# or, if x is already configuredmeson configure x -Dserver_debugger=true -Dserver_debugger_method=old```diff --git a/release.mk b/release.mkindex 94a9680e..339c42cc 100644--- a/release.mk+++ b/release.mk@@ -53,13 +53,13 @@ clean:test:[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \- meson "$(TEST_BUILD_DIR)" -Db_sanitize=address )+ meson setup "$(TEST_BUILD_DIR)" -Db_sanitize=address )ninja -C "$(TEST_BUILD_DIR)"$(GRADLE) -p server checkbuild-server:[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \- meson "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )+ meson setup "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )ninja -C "$(SERVER_BUILD_DIR)"prepare-deps-win32:@@ -76,7 +76,7 @@ prepare-deps-win64:build-win32: prepare-deps-win32[ -d "$(WIN32_BUILD_DIR)" ] || ( mkdir "$(WIN32_BUILD_DIR)" && \- meson "$(WIN32_BUILD_DIR)" \+ meson setup "$(WIN32_BUILD_DIR)" \--cross-file cross_win32.txt \--buildtype release --strip -Db_lto=true \-Dcompile_server=false \@@ -85,7 +85,7 @@ build-win32: prepare-deps-win32build-win64: prepare-deps-win64[ -d "$(WIN64_BUILD_DIR)" ] || ( mkdir "$(WIN64_BUILD_DIR)" && \- meson "$(WIN64_BUILD_DIR)" \+ meson setup "$(WIN64_BUILD_DIR)" \--cross-file cross_win64.txt \--buildtype release --strip -Db_lto=true \-Dcompile_server=false \