Merge branch 'master' into dev

This commit is contained in:
Romain Vimont
2018-04-08 12:41:51 +02:00
7 changed files with 43 additions and 8 deletions

View File

@@ -107,6 +107,20 @@ pacman -S mingw-w64-x86_64-make \
mingw-w64-x86_64-meson
```
For a 32 bits version, replace `x86_64` by `i686`:
```bash
# runtime dependencies
pacman -S mingw-w64-i686-SDL2 \
mingw-w64-i686-ffmpeg
# client build dependencies
pacman -S mingw-w64-i686-make \
mingw-w64-i686-gcc \
mingw-w64-i686-pkg-config \
mingw-w64-i686-meson
```
Java (>= 7) is not available in MSYS2, so if you plan to build the server,
install it manually and make it available from the `PATH`:
@@ -116,10 +130,17 @@ export PATH="$JAVA_HOME/bin:$PATH"
#### Mac OS
Use [Homebrew] to install the packages:
The application is available in [Homebrew]. Just install it:
[Homebrew]: https://brew.sh/
```bash
brew install scrcpy
```
Instead, you may want to build it manually. Install the packages:
```bash
# runtime dependencies
brew install sdl2 ffmpeg