Commit 0a346f20 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Add start from xterm

parent aae3bd7c
...@@ -62,9 +62,11 @@ export DXVK_LOG_LEVEL="info" ...@@ -62,9 +62,11 @@ export DXVK_LOG_LEVEL="info"
export VKD3D_DEBUG="warn" export VKD3D_DEBUG="warn"
export DXVK_HUD="fps,devinfo" export DXVK_HUD="fps,devinfo"
"${optirun_on}" "${WINELOADER}" "${gamestart}" "${launch_parameters}" 2>> "${PORT_WINE_PATH}/${portname}.log" "/usr/bin/xterm" -geometry 150x10 -sb -e '"${optirun_on}" "${WINELOADER}" "${gamestart}" "${launch_parameters}" 2>> "${PORT_WINE_PATH}/${portname}.log"'
sleep 5 START_PORTWINE
sleep 3
while [ $(pgrep wineserver)>'0' ] while [ $(pgrep wineserver)>'0' ]
do do
sleep 3 sleep 3
......
...@@ -139,15 +139,12 @@ fi ...@@ -139,15 +139,12 @@ fi
# export WINEESYNC=1 # export WINEESYNC=1
# fi # fi
#fi #fi
chmod -R 777 "${WINEPREFIX}"
${WINESERVER} -k ${WINESERVER} -k
######################################################################## ########################################################################
START_PORTWINE () START_PORTWINE ()
{ {
chown -R "$USER" "$WINEPREFIX/drive_c"
chown -R "$USER" "$WINEPREFIX"/*.reg
gpu="0" gpu="0"
export DRI_PRIME=1 export DRI_PRIME=1
export optirun_on=env export optirun_on=env
...@@ -210,13 +207,6 @@ export DXVK_STATE_CACHE=0 ...@@ -210,13 +207,6 @@ export DXVK_STATE_CACHE=0
export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}" export __GL_SHADER_DISK_CACHE_PATH="${PATH_TO_GAME}"
export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE=1
export mesa_glthread="true" export mesa_glthread="true"
if [ -x "`which nvidia-settings 2>/dev/null`" ]
then
export LD_PRELOAD="libpthread.so.0 libGL.so.1"
export __GL_THREADED_OPTIMIZATIONS=1
fi
} }
######################################################################## ########################################################################
......
...@@ -55,13 +55,13 @@ case \$xsd in ...@@ -55,13 +55,13 @@ case \$xsd in
START_PORTWINE START_PORTWINE
WINE_DX_TO_OPENGL WINE_DX_TO_OPENGL
OPENGL_SET OPENGL_SET
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;; "/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"' ;;
"\${port_start8}") "\${port_start8}")
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
VULKAN_SET VULKAN_SET
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;; "/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"' ;;
esac esac
...@@ -82,7 +82,8 @@ cat > "${link}/start" <<EOF ...@@ -82,7 +82,8 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_OPENGL WINE_DX_TO_OPENGL
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" OPENGL_SET
"/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"'
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
...@@ -98,7 +99,8 @@ cat > "${link}/start" <<EOF ...@@ -98,7 +99,8 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" VULKAN_SET
"/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"'
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
...@@ -114,7 +116,8 @@ cat > "${link}/start" <<EOF ...@@ -114,7 +116,8 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" VULKAN_SET
"/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"'
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
...@@ -130,12 +133,14 @@ cat > "${link}/start" <<EOF ...@@ -130,12 +133,14 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" VULKAN_SET
"/usr/bin/xterm" -geometry 150x10 -sb -e '"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"'
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
esac esac
########################################################################
${WINESERVER} -k
${WINEBOOT} -r
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment