mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-02-27 04:54:15 +01:00
[meta] Explicitly use meson setup command
Fixes some deprecation warnings with Meson 0.64.
This commit is contained in:
parent
bc08cac220
commit
82685ca4fc
@ -66,7 +66,7 @@ ninja install
|
|||||||
```
|
```
|
||||||
# 64-bit build. For 32-bit builds, replace
|
# 64-bit build. For 32-bit builds, replace
|
||||||
# build-win64.txt with build-win32.txt
|
# build-win64.txt with build-win32.txt
|
||||||
meson --cross-file build-win64.txt --buildtype release --prefix /your/dxvk/directory build.w64
|
meson setup --cross-file build-win64.txt --buildtype release --prefix /your/dxvk/directory build.w64
|
||||||
cd build.w64
|
cd build.w64
|
||||||
ninja install
|
ninja install
|
||||||
```
|
```
|
||||||
|
@ -55,13 +55,13 @@ function build_arch {
|
|||||||
opt_strip=--strip
|
opt_strip=--strip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CC="$CC -m$1" CXX="$CXX -m$1" meson \
|
CC="$CC -m$1" CXX="$CXX -m$1" meson setup \
|
||||||
--buildtype "release" \
|
--buildtype "release" \
|
||||||
--prefix "$DXVK_BUILD_DIR/usr" \
|
--prefix "$DXVK_BUILD_DIR/usr" \
|
||||||
$opt_strip \
|
$opt_strip \
|
||||||
--bindir "$2" \
|
--bindir "$2" \
|
||||||
--libdir "$2" \
|
--libdir "$2" \
|
||||||
-Dbuild_id=$opt_buildid \
|
-Dbuild_id=$opt_buildid \
|
||||||
"$DXVK_BUILD_DIR/build.$1"
|
"$DXVK_BUILD_DIR/build.$1"
|
||||||
|
|
||||||
cd "$DXVK_BUILD_DIR/build.$1"
|
cd "$DXVK_BUILD_DIR/build.$1"
|
||||||
|
@ -57,13 +57,13 @@ function build_arch {
|
|||||||
opt_strip=--strip
|
opt_strip=--strip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
meson --cross-file "$DXVK_SRC_DIR/$crossfile$1.txt" \
|
meson setup --cross-file "$DXVK_SRC_DIR/$crossfile$1.txt" \
|
||||||
--buildtype "release" \
|
--buildtype "release" \
|
||||||
--prefix "$DXVK_BUILD_DIR" \
|
--prefix "$DXVK_BUILD_DIR" \
|
||||||
$opt_strip \
|
$opt_strip \
|
||||||
--bindir "x$1" \
|
--bindir "x$1" \
|
||||||
--libdir "x$1" \
|
--libdir "x$1" \
|
||||||
-Dbuild_id=$opt_buildid \
|
-Dbuild_id=$opt_buildid \
|
||||||
"$DXVK_BUILD_DIR/build.$1"
|
"$DXVK_BUILD_DIR/build.$1"
|
||||||
|
|
||||||
cd "$DXVK_BUILD_DIR/build.$1"
|
cd "$DXVK_BUILD_DIR/build.$1"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user