build: Replace build_linux32 with env vars

This is much distro-agnostic.

(Only sane distros [Arch] use /usr/lib32 and not /usr/lib/i386-linux-gnu)

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2020-11-05 16:40:15 +00:00 committed by Joshie
parent 6bfead391d
commit c5e3779257
3 changed files with 8 additions and 26 deletions

View File

@ -55,11 +55,13 @@ ninja install
```
# 64-bit build.
meson --cross-file build-win64.txt --buildtype release --prefix /your/vkd3d-proton/directory build.64
cd build.64
ninja install
# 32-bit build
meson --cross-file build-win32.txt --buildtype release --prefix /your/vkd3d-proton/directory build.86
cd build.86
ninja install
```
@ -68,11 +70,15 @@ ninja install
```
# 64-bit build.
meson --buildtype release --prefix /your/vkd3d-proton/directory build.64
cd build.64
ninja install
# 32-bit build
meson --cross-file x86-linux-gnu --buildtype release --prefix /your/vkd3d-proton/directory build.86
CC="gcc -m32" CXX="g++ -m32" \
PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig" \
meson --buildtype release --prefix /your/vkd3d-proton/directory build.86
cd build.86
ninja install
```

View File

@ -1,24 +0,0 @@
[binaries]
c = 'gcc'
cpp = 'g++'
ar = 'gcc-ar'
strip = 'strip'
[properties]
c_args = ['-m32']
c_link_args = ['-m32']
cpp_args = ['-m32']
cpp_link_args = ['-m32']
pkg_config_path = ['/usr/lib32/pkgconfig']
pkg_config_libdir = ['/usr/lib32/pkgconfig']
[paths]
prefix = '/usr'
libdir = 'lib32'
bindir = 'bin'
[host_machine]
system = 'linux'
cpu_family = 'x86'
cpu = 'i686'
endian = 'little'

View File

@ -89,7 +89,7 @@ if [ $opt_native -eq 0 ]; then
build_script
else
build_arch 64
build_arch 86 --cross-file build-linux32.txt
CC="gcc -m32" CXX="g++ -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig" build_arch 86
fi
if [ $opt_nopackage -eq 0 ]; then