Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Use "meson setup"

Browse source 
This fixes the following warning:

> WARNING: Running the setup command as `meson [options]` instead of
> `meson setup [options]` is ambiguous and deprecated.
This commit is contained in:
Romain Vimont 2022-12-21 13:29:27 +01:00
parent 82cb8ab870
commit 64821466a1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BUILD.md
View file

@ -260,7 +260,7 @@ set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdk
Then, build: Then, build:
```bash ```bash
meson x --buildtype=release --strip -Db_lto=true meson setup x --buildtype=release --strip -Db_lto=true
ninja -Cx # DO NOT RUN AS ROOT ninja -Cx # DO NOT RUN AS ROOT
``` ```
@ -281,7 +281,7 @@ Download the prebuilt server somewhere, and specify its path during the Meson
configuration: configuration:
```bash ```bash
meson x --buildtype=release --strip -Db_lto=true \ meson setup x --buildtype=release --strip -Db_lto=true \
-Dprebuilt_server=/path/to/scrcpy-server -Dprebuilt_server=/path/to/scrcpy-server
ninja -Cx # DO NOT RUN AS ROOT ninja -Cx # DO NOT RUN AS ROOT
``` ```

4
DEVELOP.md
View file

@ -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: To debug it, enable the server debugger during configuration:
```bash ```bash
meson x -Dserver_debugger=true meson setup x -Dserver_debugger=true
# or, if x is already configured # or, if x is already configured
meson configure x -Dserver_debugger=true meson 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: `old` in addition:
```bash ```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 configured # or, if x is already configured
meson configure x -Dserver_debugger=true -Dserver_debugger_method=old meson configure x -Dserver_debugger=true -Dserver_debugger_method=old
``` ```

8
release.mk
View file

@ -53,13 +53,13 @@ clean:
test: test:
[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \ [ -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)" ninja -C "$(TEST_BUILD_DIR)"
$(GRADLE) -p server check $(GRADLE) -p server check
build-server: build-server:
[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \ [ -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)" ninja -C "$(SERVER_BUILD_DIR)"
prepare-deps-win32: prepare-deps-win32:
@ -76,7 +76,7 @@ prepare-deps-win64:
build-win32: prepare-deps-win32 build-win32: prepare-deps-win32
[ -d "$(WIN32_BUILD_DIR)" ] || ( mkdir "$(WIN32_BUILD_DIR)" && \ [ -d "$(WIN32_BUILD_DIR)" ] || ( mkdir "$(WIN32_BUILD_DIR)" && \
meson "$(WIN32_BUILD_DIR)" \ meson setup "$(WIN32_BUILD_DIR)" \
--cross-file cross_win32.txt \ --cross-file cross_win32.txt \
--buildtype release --strip -Db_lto=true \ --buildtype release --strip -Db_lto=true \
-Dcompile_server=false \ -Dcompile_server=false \
@ -85,7 +85,7 @@ build-win32: prepare-deps-win32
build-win64: prepare-deps-win64 build-win64: prepare-deps-win64
[ -d "$(WIN64_BUILD_DIR)" ] || ( mkdir "$(WIN64_BUILD_DIR)" && \ [ -d "$(WIN64_BUILD_DIR)" ] || ( mkdir "$(WIN64_BUILD_DIR)" && \
meson "$(WIN64_BUILD_DIR)" \ meson setup "$(WIN64_BUILD_DIR)" \
--cross-file cross_win64.txt \ --cross-file cross_win64.txt \
--buildtype release --strip -Db_lto=true \ --buildtype release --strip -Db_lto=true \
-Dcompile_server=false \ -Dcompile_server=false \