Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-28 23:55:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

build_proton: Ship dxvk on mac, too

Browse Source
This commit is contained in:
Andrew Eikum 2018-03-23 15:47:29 -05:00
parent 98d4ab35f1
commit b638eb1602
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
build_proton.sh
View File

@ -435,43 +435,41 @@ function build_vrclient32
cp -a vrclient.dll.fake "$DST_DIR"/lib/wine/fakedlls/vrclient.dll cp -a vrclient.dll.fake "$DST_DIR"/lib/wine/fakedlls/vrclient.dll
} }
if [ "$PLATFORM" != "Darwin" ]; then #build dxvk
#build dxvk
#Debian 9 is too old to build dxvk, so I gave up and I'm building it on my Arch #Debian 9 is too old to build dxvk, so I gave up and I'm building it on my Arch
#Linux box and checking the binaries into Git instead. Blech. --aeikum #Linux box and checking the binaries into Git instead. Blech. --aeikum
cd "$TOP" cd "$TOP"
mkdir -p "$DST_DIR"/lib64/wine/dxvk mkdir -p "$DST_DIR"/lib64/wine/dxvk
cp "dxvk.win64/dxgi.dll" "$DST_DIR"/lib64/wine/dxvk/ cp "dxvk.win64/dxgi.dll" "$DST_DIR"/lib64/wine/dxvk/
cp "dxvk.win64/d3d11.dll" "$DST_DIR"/lib64/wine/dxvk/ cp "dxvk.win64/d3d11.dll" "$DST_DIR"/lib64/wine/dxvk/
mkdir -p "$DST_DIR"/lib/wine/dxvk mkdir -p "$DST_DIR"/lib/wine/dxvk
cp "dxvk.win32/dxgi.dll" "$DST_DIR"/lib/wine/dxvk/ cp "dxvk.win32/dxgi.dll" "$DST_DIR"/lib/wine/dxvk/
cp "dxvk.win32/d3d11.dll" "$DST_DIR"/lib/wine/dxvk/ cp "dxvk.win32/d3d11.dll" "$DST_DIR"/lib/wine/dxvk/
#unfortunately the Steam runtime chroot is too old to build dxvk, so #unfortunately the Steam runtime chroot is too old to build dxvk, so
#we have to build it in the host system #we have to build it in the host system
#requires meson >= 0.43 and posix thread enabled mingw-w64, on debian: #requires meson >= 0.43 and posix thread enabled mingw-w64, on debian:
# update-alternatives --config i686-w64-mingw32-g++ # update-alternatives --config i686-w64-mingw32-g++
# update-alternatives --config i686-w64-mingw32-gcc # update-alternatives --config i686-w64-mingw32-gcc
# update-alternatives --config x86_64-w64-mingw32-g++ # update-alternatives --config x86_64-w64-mingw32-g++
# update-alternatives --config x86_64-w64-mingw32-gcc # update-alternatives --config x86_64-w64-mingw32-gcc
#cd "$TOP" #cd "$TOP"
#if [ ! -e dxvk/proton.win64.built ]; then #if [ ! -e dxvk/proton.win64.built ]; then
# PATH="$TOP"/glslang/bin/:"$PATH" bash ./build_dxvk.sh win64 # PATH="$TOP"/glslang/bin/:"$PATH" bash ./build_dxvk.sh win64
#fi #fi
#if [ ! -e dxvk/proton.win32.built ]; then #if [ ! -e dxvk/proton.win32.built ]; then
# PATH="$TOP"/glslang/bin/:"$PATH" bash ./build_dxvk.sh win32 # PATH="$TOP"/glslang/bin/:"$PATH" bash ./build_dxvk.sh win32
#fi #fi
# #
#mkdir -p "$DST_DIR"/lib/wine/dxvk #mkdir -p "$DST_DIR"/lib/wine/dxvk
#cp -a dxvk/dist.win32/bin/dxgi.dll "$DST_DIR"/lib/wine/dxvk/ #cp -a dxvk/dist.win32/bin/dxgi.dll "$DST_DIR"/lib/wine/dxvk/
#cp -a dxvk/dist.win32/bin/d3d11.dll "$DST_DIR"/lib/wine/dxvk/ #cp -a dxvk/dist.win32/bin/d3d11.dll "$DST_DIR"/lib/wine/dxvk/
# #
#mkdir -p "$DST_DIR"/lib64/wine/dxvk #mkdir -p "$DST_DIR"/lib64/wine/dxvk
#cp -a dxvk/dist.win64/bin/dxgi.dll "$DST_DIR"/lib64/wine/dxvk/ #cp -a dxvk/dist.win64/bin/dxgi.dll "$DST_DIR"/lib64/wine/dxvk/
#cp -a dxvk/dist.win64/bin/d3d11.dll "$DST_DIR"/lib64/wine/dxvk/ #cp -a dxvk/dist.win64/bin/d3d11.dll "$DST_DIR"/lib64/wine/dxvk/
fi
case "$BUILD_COMPONENTS" in case "$BUILD_COMPONENTS" in
"all") "all")