Change argument order in meson setup command

This commit is contained in:
Robbert van der Helm
2021-06-24 13:42:58 +02:00
parent f0c26cbe06
commit b64b18f75e
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -48,7 +48,7 @@ jobs:
# Statically link to libstdc++ on Ubuntu 18.04 as we're compiling # Statically link to libstdc++ on Ubuntu 18.04 as we're compiling
# with a newer version of g++ than what's in the default repos # with a newer version of g++ than what's in the default repos
meson setup --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true -Dcpp_link_args='-static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++' build meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true -Dcpp_link_args='-static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++'
ninja -C build ninja -C build
- name: Create an archive for the binaries - name: Create an archive for the binaries
run: | run: |
@@ -87,7 +87,7 @@ jobs:
mkdir -p /tmp/prefix mkdir -p /tmp/prefix
export WINEPREFIX=/tmp/prefix export WINEPREFIX=/tmp/prefix
meson setup --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true build meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true
ninja -C build ninja -C build
- name: Create an archive for the binaries - name: Create an archive for the binaries
run: | run: |
+3 -3
View File
@@ -712,7 +712,7 @@ disable unity builds completely by getting rid of `--unity=on` at the cost of
slightly longer build times. slightly longer build times.
```shell ```shell
meson setup --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 build meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000
ninja -C build ninja -C build
``` ```
@@ -742,7 +742,7 @@ bit versions of the Boost and XCB libraries. This can then be set up as follows:
# Enable the bitbridge on an existing build # Enable the bitbridge on an existing build
meson configure build -Dwith-bitbridge=true meson configure build -Dwith-bitbridge=true
# Or configure a new build from scratch # Or configure a new build from scratch
meson setup --buildtype=release --cross-file cross-wine.conf -Dwith-bitbridge=true build meson setup build --buildtype=release --cross-file cross-wine.conf -Dwith-bitbridge=true
ninja -C build ninja -C build
``` ```
@@ -764,7 +764,7 @@ you're compiling from a 64-bit system, so if you're compiling on an actual
`yabridge-group` binaries in `meson.build`: `yabridge-group` binaries in `meson.build`:
```shell ```shell
meson setup --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dwith-bitbridge=true -Dbuild.cpp_link_args='-m32' build meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dwith-bitbridge=true -Dbuild.cpp_link_args='-m32'
ninja -C build ninja -C build
``` ```