Fix missing arch switch in setup script

This commit is contained in:
raffarti 2018-01-29 11:45:56 +01:00
parent aab936b7c4
commit c79542234d
2 changed files with 7 additions and 0 deletions

View file

@ -1,6 +1,7 @@
#!/bin/bash
dlls_dir='@dlldir@'
build_arch='@arch@'
path_pattern='s|^\s*PATH\s+REG_EXPAND_SZ\s+(.*)\s*$|\1|g'
dlls_windir=$(winepath -w "$dlls_dir")
dlls_windir_pattern="$(sed 's|\\|\\\\|g'<<<$dlls_windir)"
@ -52,6 +53,11 @@ function addToPATH {
if [ "$1" == "overrides" ]; then
set -e
if [ $build_arch == "x86_64" ]; then
wine=wine64
else
wine=wine
fi
unix_sys_path="$($wine winepath -u 'C:\windows\system32')"
wine reg add HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides /v d3d11 /d native /f
wine reg add HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides /v dxgi /d native /f

View file

@ -1,5 +1,6 @@
conf = configuration_data()
conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir'))
conf.set('arch', target_machine.cpu_family())
configure_file(
configuration : conf,
input : 'dlls_setup.sh.in',