Skip to content

P
PortWINE
Commit 6a1df190 authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

Major changes

parent ad1a28a4
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 117 deletions
data_from_portwine/proton → data_from_portwine/port_on
View file @ 6a1df190
...@@ -121,6 +121,7 @@ class CompatData: ...@@ -121,6 +121,7 @@ class CompatData:
self.prefix_dir = self.path("pfx/") self.prefix_dir = self.path("pfx/")
self.version_file = self.path("version") self.version_file = self.path("version")
self.tracked_files_file = self.path("tracked_files") self.tracked_files_file = self.path("tracked_files")
# if "PW_FILELOCK" in os.environ and nonzero(os.environ["PW_FILELOCK"]):
self.prefix_lock = FileLock(self.path("pfx.lock"), timeout=-1) self.prefix_lock = FileLock(self.path("pfx.lock"), timeout=-1)
def path(self, d): def path(self, d):
...@@ -319,8 +320,8 @@ class Session: ...@@ -319,8 +320,8 @@ class Session:
def init_session(self): def init_session(self):
self.env["WINEPREFIX"] = g_compatdata.prefix_dir self.env["WINEPREFIX"] = g_compatdata.prefix_dir
if "PORTWINE_LOG" in os.environ and nonzero(os.environ["PORTWINE_LOG"]): if "PW_LOG" in os.environ and nonzero(os.environ["PW_LOG"]):
self.env.setdefault("WINEDEBUG", "+timestamp,+pid,+tid,+seh,+debugstr,+loaddll,+mscoree") self.env.setdefault("WINEDEBUG", "fixme-all")
self.env.setdefault("DXVK_LOG_LEVEL", "info") self.env.setdefault("DXVK_LOG_LEVEL", "info")
self.env.setdefault("VKD3D_DEBUG", "warn") self.env.setdefault("VKD3D_DEBUG", "warn")
self.env.setdefault("WINE_MONO_TRACE", "E:System.NotImplementedException") self.env.setdefault("WINE_MONO_TRACE", "E:System.NotImplementedException")
...@@ -336,17 +337,17 @@ class Session: ...@@ -336,17 +337,17 @@ class Session:
if "wined3d11" in self.compat_config: if "wined3d11" in self.compat_config:
self.compat_config.add("wined3d") self.compat_config.add("wined3d")
if not self.check_environment("PROTON_USE_WINED3D", "wined3d"): if not self.check_environment("PW_USE_WINED3D", "wined3d"):
self.check_environment("PROTON_USE_WINED3D11", "wined3d") self.check_environment("PW_USE_WINED3D11", "wined3d")
self.check_environment("PROTON_NO_D3D11", "nod3d11") self.check_environment("PW_NO_D3D11", "nod3d11")
self.check_environment("PROTON_NO_D3D10", "nod3d10") self.check_environment("PW_NO_D3D10", "nod3d10")
self.check_environment("PROTON_NO_D9VK", "nod3d9") self.check_environment("PW_NO_D9VK", "nod3d9")
self.check_environment("PROTON_NO_ESYNC", "noesync") self.check_environment("PW_NO_ESYNC", "noesync")
self.check_environment("PROTON_NO_FSYNC", "nofsync") self.check_environment("PW_NO_FSYNC", "nofsync")
self.check_environment("PROTON_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd") self.check_environment("PW_FORCE_LARGE_ADDRESS_AWARE", "forcelgadd")
self.check_environment("PROTON_OLD_GL_STRING", "oldglstr") self.check_environment("PW_OLD_GL_STRING", "oldglstr")
self.check_environment("PROTON_USE_SECCOMP", "seccomp") self.check_environment("PW_USE_SECCOMP", "seccomp")
self.check_environment("PORTWINE_NO_VR", "novrclient") self.check_environment("PW_NO_VR", "novrclient")
if not "noesync" in self.compat_config: if not "noesync" in self.compat_config:
self.env["WINEESYNC"] = "1" self.env["WINEESYNC"] = "1"
......
data_from_portwine/scripts/debug
View file @ 6a1df190
...@@ -62,23 +62,16 @@ echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log" ...@@ -62,23 +62,16 @@ echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log"
echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "log WINE" >> "${PORT_WINE_PATH}/${portname}.log" echo "log WINE" >> "${PORT_WINE_PATH}/${portname}.log"
export PORTWINE_LOG=1 export PW_LOG=1
export WINEDEBUG="fixme-all"
export DXVK_LOG_LEVEL="info"
export VK_LOADER_DEBUG="warn"
export VKD3D_DEBUG="warn"
export DXVK_HUD="full" export DXVK_HUD="full"
export WINE_MONO_TRACE="E:System.NotImplementedException"
#"/usr/bin/xterm" -geometry 130x13 -sb -e 'echo "--------------------------------------------------------PORTWINE-LINUX.RU--------------------------------------------------------" && "${PROTONRUN}" "run" "${gamestart}" "${launch_parameters}" &>> "${PORT_WINE_PATH}/${portname}.log"'
if [ ! -z ${optirun_on} ] if [ ! -z ${optirun_on} ]
then then
${optirun_on} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
else else
"${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 "${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
fi fi
zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k
KILL9_WINEDEVICE | pwzen
STOP_PORTWINE | pwzen STOP_PORTWINE | pwzen
deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++') deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++')
...@@ -86,5 +79,3 @@ echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" ...@@ -86,5 +79,3 @@ echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log"
echo "$deb_text" | zenity --text-info --editable \ echo "$deb_text" | zenity --text-info --editable \
--width=800 --height=600 \ --width=800 --height=600 \
--title="${portname}.log" --title="${portname}.log"
#xdg-open "${PORT_WINE_PATH}/${portname}.log"
data_from_portwine/scripts/lang
View file @ 6a1df190
...@@ -11,7 +11,7 @@ then ...@@ -11,7 +11,7 @@ then
export inst_set_top="Установка PortWINE" export inst_set_top="Установка PortWINE"
export ss_title="Опции запуска:" export ss_title="Опции запуска:"
export ss_text="Выберите желаемый вариант запуска ${portname}. Вы всегда можете изменить свой выбор, \nзапустив ярлык restart из каталога: "${PORT_WINE_PATH}"/" export ss_text="Выберите желаемый вариант запуска ${portname}. Вы всегда можете изменить свой выбор, \nзапустив ярлык reset из каталога: "${PORT_WINE_PATH}"/"
export ss_ver="Версия?" export ss_ver="Версия?"
export ss_default_1="Cтандартный запуск" export ss_default_1="Cтандартный запуск"
export ss_default_2="Старый запуск, с вопросами и логами" export ss_default_2="Старый запуск, с вопросами и логами"
...@@ -53,6 +53,23 @@ then ...@@ -53,6 +53,23 @@ then
export port_time5="Сейчас не могу, может быть в другой раз." export port_time5="Сейчас не могу, может быть в другой раз."
export port_time6="Я уже сделал вклад в будущее проекта." export port_time6="Я уже сделал вклад в будущее проекта."
export port_debug="После окончания ${portname}, нажмите ОК."
export hud_text="Выберите вывод необходимой информации на экран:"
export hud_info="Отображать:"
export hud_fps="частоту кадров"
export hud_devinfo="название графического процессора и версию драйвера"
export hud_frametimes="график времени кадра"
export hud_submissions="количество командных буферов, представленных на кадр"
export hud_drawcalls="количество вызовов отрисовки и отрисовки пропусков на кадр"
export hud_pipelines="общее количество графических и вычислительных конвейеров"
export hud_memory="объем памяти устройства, выделенной и использованной"
export hud_gpuload="предполагаемую загрузку графического процессора (может быть неточна)"
export hud_version="используемую версию DXVK"
export hud_api="уровень функций D3D, используемый приложением"
export hud_compiler="активность шейдерного компилятора"
export hud_samplers="текущее количество используемых пар сэмплеров (только для D3D9)"
elif [ "${update_loc}" = "ENG" ] elif [ "${update_loc}" = "ENG" ]
then then
...@@ -60,7 +77,7 @@ then ...@@ -60,7 +77,7 @@ then
export inst_set_top="PortWINE setting" export inst_set_top="PortWINE setting"
export ss_title="Settings::" export ss_title="Settings::"
export ss_text="Choose your preferred ${portname} launch option. You can always change your choice by unsetting\nthe restart shortcut from the directory: "${PORT_WINE_PATH}"/" export ss_text="Choose your preferred ${portname} launch option. You can always change your choice by unsetting\nthe reset shortcut from the directory: "${PORT_WINE_PATH}"/"
export ss_ver="Version:" export ss_ver="Version:"
export ss_default_1="Standard start" export ss_default_1="Standard start"
export ss_default_2="Old startup, with questions and logs" export ss_default_2="Old startup, with questions and logs"
...@@ -96,11 +113,28 @@ then ...@@ -96,11 +113,28 @@ then
export port_start8="DXVK" export port_start8="DXVK"
export port_time1="Information" export port_time1="Information"
export port_time2="Do you think that it is difficult to help the author develop the project? No! It is enough that you would sacrifice what you think is necessary, well, or at least 1$." export port_time2="Do you think that it is difficult to help the author develop the project?\nNo! It is enough that you would sacrifice what you think is necessary, well, or at least 1$."
export port_time3="Action:" export port_time3="Action:"
export port_time4="Go to the site and help develop the project" export port_time4="Go to the site and help develop the project"
export port_time5="I do not want to help the project" export port_time5="I do not want to help the project"
export port_time6="I'm well done and have already contributed to the future of the project" export port_time6="I'm well done and have already contributed to the future of the project"
export port_debug="After finishing the ${portname}, click OK."
export hud_text="The DXVK_HUD environment variable controls a HUD which can display the framerate\nand some stat counters. It accepts a comma-separated list of the following options:"
export hud_info="Description:"
export hud_fps="Shows the current frame rate."
export hud_devinfo="Displays the name of the GPU and the driver version."
export hud_frametimes="Shows a frame time graph."
export hud_submissions="Shows the number of command buffers submitted per frame."
export hud_drawcalls="Shows the number of draw calls and render passes per frame."
export hud_pipelines="Shows the total number of graphics and compute pipelines."
export hud_memory="Shows the amount of device memory allocated and used."
export hud_gpuload="Shows estimated GPU load. May be inaccurate."
export hud_version="Shows DXVK version."
export hud_api="Shows the D3D feature level used by the application."
export hud_compiler="Shows shader compiler activity"
export hud_samplers="Shows the current number of sampler pairs used [D3D9 Only]"
fi fi
data_from_portwine/scripts/restart → data_from_portwine/scripts/reset
View file @ 6a1df190
...@@ -6,5 +6,8 @@ wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineser ...@@ -6,5 +6,8 @@ wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineser
if ! [ -z "${wine_pids}" ] ; then if ! [ -z "${wine_pids}" ] ; then
kill -9 ${wine_pids} kill -9 ${wine_pids}
fi fi
rm -f "${config_path}/dxvk_on" if [ -e "${config_path}/dxvk_on" ]; then
rm -f "${config_path}/dxvk_on"
fi
START_PORTWINE
STOP_PORTWINE | pwzen STOP_PORTWINE | pwzen
data_from_portwine/scripts/runlib
View file @ 6a1df190
...@@ -11,15 +11,13 @@ pwzen() { ...@@ -11,15 +11,13 @@ pwzen() {
zenity --progress --title="Settings..." --text="Please wait!" --pulsate --auto-close --auto-kill --width=450 zenity --progress --title="Settings..." --text="Please wait!" --pulsate --auto-close --auto-kill --width=450
} }
######################################################################## ########################################################################
export kill_winedevice=0
export kill_explorer=0
########################################################################
cd "$(dirname "`readlink -f "$0"`")" cd "$(dirname "`readlink -f "$0"`")"
export link="$(pwd)" export link="$(pwd)"
cd "${link}/../../" cd "${link}/../../"
export PORT_WINE_PATH="$(pwd)" export PORT_WINE_PATH="$(pwd)"
cd "${link}" cd "${link}"
. "${link}"/vars . "${link}"/vars
########################################################################
export config_path="${PORT_WINE_PATH}/data/tmp" export config_path="${PORT_WINE_PATH}/data/tmp"
if [ ! -d "${config_path}" ]; then if [ ! -d "${config_path}" ]; then
mkdir -p "${config_path}" mkdir -p "${config_path}"
...@@ -31,32 +29,15 @@ if [ ! -e "${config_path}/${portname}_loc" ]; then ...@@ -31,32 +29,15 @@ if [ ! -e "${config_path}/${portname}_loc" ]; then
FALSE "ENG" ` FALSE "ENG" `
echo "${SET_LANG}" > "${config_path}/${portname}_loc" echo "${SET_LANG}" > "${config_path}/${portname}_loc"
fi fi
########################################################################
. "${link}"/lang . "${link}"/lang
if [ ! -e "${config_path}/${portname}_ver" ]; then if [ ! -e "${config_path}/${portname}_ver" ]; then
echo "10" > "${config_path}/${portname}_ver" echo "10" > "${config_path}/${portname}_ver"
fi fi
if [ ! -f "${config_path}/dxvk_on" ]; then
start_settings=`zenity --title "${ss_title}" --text "${ss_text}" --list --radiolist \
--column="${inst_set}" --column "${ss_ver}" --column "${ss_dr}" --width=600 --height=250 \
FALSE "OpenGL" "${ss_ogl_2}" \
FALSE "DXVK+HUD" "${ss_ogl_3} + HUD" \
TRUE "DXVK" "${ss_ogl_3}" `
if [ $? = 1 ];then exit 1; fi
case $start_settings in
"OpenGL")
echo "0" > "${config_path}/dxvk_on" ;;
"DXVK")
echo "1" > "${config_path}/dxvk_on" ;;
"DXVK+HUD")
echo "2" > "${config_path}/dxvk_on" ;;
esac
fi
read "var_dxvk_on" < "${config_path}/dxvk_on"
export "var_dxvk_on"
######################################################################## ########################################################################
export WINEDIR="${PORT_WINE_PATH}"/data/dist export WINEDIR="${PORT_WINE_PATH}"/data/dist
export WINELIB="${PORT_WINE_PATH}"/data/libs export WINELIB="${PORT_WINE_PATH}"/data/libs
export PROTONRUN="${PORT_WINE_PATH}/data/proton" export port_on_run="${PORT_WINE_PATH}/data/port_on"
export WINEARCH=win64 export WINEARCH=win64
export WINELOADER="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine"
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
...@@ -66,7 +47,6 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" ...@@ -66,7 +47,6 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
export PATH="${WINEDIR}/bin:${PATH}" export PATH="${WINEDIR}/bin:${PATH}"
export WINESTART="C:\\windows\\command\\start.exe" export WINESTART="C:\\windows\\command\\start.exe"
export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/" export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
export PORTWINE_NO_VR=1
######################################################################## ########################################################################
export urlg="http://portwine-linux.ru/donate" export urlg="http://portwine-linux.ru/donate"
######################################################################## ########################################################################
...@@ -90,7 +70,69 @@ if [ -d "${WINELIB}" ]; then ...@@ -90,7 +70,69 @@ if [ -d "${WINELIB}" ]; then
else else
echo "runtime libs is disabled" echo "runtime libs is disabled"
fi fi
########################################################################
if [ ! -f "${config_path}/dxvk_on" ]
then
start_settings=`zenity --title "${ss_title}" --text "${ss_text}" --list --radiolist \
--column="${inst_set}" --column "${ss_ver}" --column "${ss_dr}" --width=500 --height=220 \
TRUE "DXVK" "${ss_ogl_3}" \
FALSE "OpenGL" "${ss_ogl_2}" `
if [ $? -eq 1 ];then exit 1; fi
case $start_settings in
"OpenGL")
echo "off" > "${config_path}/dxvk_on" ;;
"DXVK")
hud_settings=`zenity --list --title "HUD" --text "${hud_text}" --list --checklist \
--column="${inst_set}" --column="HUD info:" --column="${hud_info}" --width=800 --height=550 \
FALSE "fps" "${hud_fps}" \
FALSE "devinfo" "${hud_devinfo}" \
FALSE "frametimes" "${hud_frametimes}" \
FALSE "submissions" "${hud_submissions}" \
FALSE "drawcalls" "${hud_drawcalls}" \
FALSE "pipelines" "${hud_pipelines}" \
FALSE "memory" "${hud_memory}" \
FALSE "gpuload" "${hud_gpuload}" \
FALSE "version" "${hud_version}" \
FALSE "api" "${hud_api}" \
FALSE "compiler" "${hud_compiler}" \
FALSE "samplers" "${hud_samplers}" `
if [ ! -z $hud_settings ]; then
for hud_set in $hud_settings
do
echo "${hud_set}" >> "${config_path}/dxvk_on"
done
sed -i "s/|/,/g" "${config_path}/dxvk_on"
else
echo "0" > "${config_path}/dxvk_on"
fi ;;
esac
fi
read "var_dxvk_on" < "${config_path}/dxvk_on"
export "var_dxvk_on"
if [ "${var_dxvk_on}" != "off" ]; then
export DXVK_HUD="${var_dxvk_on}"
export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}"
export DXVK_STATE_CACHE=1
export PW_USE_WINED3D=0
export PW_DXGI_FOR_VKD3D=0
export PW_NO_D9VK=0
export PW_NO_D3D11=0
export PW_NO_D3D10=0
export DXVK_ASYNC=0
echo "Use DXVK mod."
echo "DXVK_HUD=${var_dxvk_on}"
else
export DXVK_STATE_CACHE=0
export PW_USE_WINED3D=1
export PW_DXGI_FOR_VKD3D=1
export PW_NO_D9VK=0
export PW_NO_D3D11=0
export PW_NO_D3D10=0
export PW_OLD_GL_STRING=0
echo "Use OpenGL mod."
fi
########################################################################
export optirun_on= export optirun_on=
if [ -x "`which nvidia-settings 2>/dev/null`" ]; then if [ -x "`which nvidia-settings 2>/dev/null`" ]; then
if [ -x "`which primusrun 2>/dev/null`" ]; then if [ -x "`which primusrun 2>/dev/null`" ]; then
...@@ -120,7 +162,7 @@ else ...@@ -120,7 +162,7 @@ else
export AMD_ATI="$(lspci | grep AMD/ATI)" export AMD_ATI="$(lspci | grep AMD/ATI)"
if [ ! -z "${AMD_ATI}" ]; then if [ ! -z "${AMD_ATI}" ]; then
# export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk_amd.conf" # export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk_amd.conf"
if [ "${PORTWINE_ACO}" = "1" ]; then if [ "${PW_ACO}" = "1" ]; then
export RADV_PERFTEST=aco export RADV_PERFTEST=aco
echo "ACO is enabled" echo "ACO is enabled"
else else
...@@ -128,25 +170,17 @@ else ...@@ -128,25 +170,17 @@ else
fi fi
fi fi
fi fi
export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}" ########################################################################
export DXVK_STATE_CACHE=1
if [ "${var_dxvk_on}" = "0" ]; then
export DXVK_STATE_CACHE=0
elif [ "${var_dxvk_on}" = "1" ]; then
export DXVK_HUD=0
elif [ "${var_dxvk_on}" = "2" ]; then
export DXVK_HUD="fps,devinfo,version,frametimes"
fi
export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/" export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/"
if [ ! -d "${def_pfx}" ]; then if [ ! -d "${def_pfx}" ]; then
"${PROTONRUN}" "run" | pwzen "${port_on_run}" "run" | pwzen
fi fi
export PROTON_NO_FSYNC=0 export PW_NO_FSYNC=0
if [ "$(ulimit -n)" -lt 50000 ]; then if [ "$(ulimit -n)" -lt 50000 ]; then
export PROTON_NO_ESYNC=1 export PW_NO_ESYNC=1
echo "ESYNC is disabled" echo "ESYNC is disabled"
else else
export PROTON_NO_ESYNC=0 export PW_NO_ESYNC=0
echo "ESYNC is enabled" echo "ESYNC is enabled"
fi fi
export int_xneur=0 export int_xneur=0
...@@ -154,6 +188,7 @@ if [ $(pgrep xneur)>'0' ]; then ...@@ -154,6 +188,7 @@ if [ $(pgrep xneur)>'0' ]; then
killall xneur killall xneur
export int_xneur=1 export int_xneur=1
fi fi
########################################################################
if [ -x "`which "gamemoderun" 2>/dev/null`" ]; then if [ -x "`which "gamemoderun" 2>/dev/null`" ]; then
sleep 1 sleep 1
systemctl --user enable gamemoded.service systemctl --user enable gamemoded.service
......
data_from_portwine/scripts/setup
View file @ 6a1df190
...@@ -47,7 +47,7 @@ echo ""[Desktop Entry]" ...@@ -47,7 +47,7 @@ echo ""[Desktop Entry]"
chmod u+x "${PORT_WINE_PATH}/Settings/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/Settings/${name_desktop}.desktop"
done done
for name_desktop in "remove" "debug" "restart" for name_desktop in "debug" "reset"
do do
echo ""[Desktop Entry]" echo ""[Desktop Entry]"
"Name=${name_desktop}" "Name=${name_desktop}"
...@@ -62,6 +62,16 @@ done ...@@ -62,6 +62,16 @@ done
echo ""[Desktop Entry]" echo ""[Desktop Entry]"
"Name=winetricks" "Name=winetricks"
"Exec="${PORT_WINE_PATH}/data/scripts/remove""
"Type=Application"
"Categories=Game"
"StartupNotify=true"
"Path="${PORT_WINE_PATH}/data/scripts/""
"Icon="${PORT_WINE_PATH}/data/img/rm.png""" > "${PORT_WINE_PATH}/Settings/remove.desktop"
chmod u+x "${PORT_WINE_PATH}/Settings/remove.desktop"
echo ""[Desktop Entry]"
"Name=winetricks"
"Exec="${PORT_WINE_PATH}/data/scripts/winetricks-q-force"" "Exec="${PORT_WINE_PATH}/data/scripts/winetricks-q-force""
"Type=Application" "Type=Application"
"Categories=Game" "Categories=Game"
......
data_from_portwine/scripts/start
View file @ 6a1df190
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"${WINESERVER}" -k "${WINESERVER}" -k
START_PORTWINE START_PORTWINE
if [ ! -z ${optirun_on} ]; then if [ ! -z ${optirun_on} ]; then
${optirun_on} "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} &>/dev/null ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
else else
"${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} &>/dev/null "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
fi fi
STOP_PORTWINE STOP_PORTWINE
data_from_portwine/scripts/vars
View file @ 6a1df190
...@@ -2,39 +2,25 @@ ...@@ -2,39 +2,25 @@
# License GPL # License GPL
# Author: Tergoev M.A. # Author: Tergoev M.A.
######################################################################## ########################################################################
export portname="" export portname="PortXXX"
export gamename="" export gamename="GameXXX"
export gamedir="" export gamedir="GameDirXXX"
export porturl="http://portwine-linux.ru/" export porturl="http://portwine-linux.ru/"
export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}" export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
export gamestart="${PATH_TO_GAME}/.exe" export gamestart="${PATH_TO_GAME}/.exe"
######################################################################## ########################################################################
#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT #export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
export STAGING_SHARED_MEMORY=1 export STAGING_SHARED_MEMORY=1
export PROTON_FORCE_LARGE_ADDRESS_AWARE=1 export PW_FORCE_LARGE_ADDRESS_AWARE=1
export PROTON_USE_SECCOMP=0 export PW_USE_SECCOMP=0
export WINEDLLOVERRIDES="winemenubuilder.exe=d" export WINEDLLOVERRIDES="winemenubuilder.exe=d"
export WINEDEBUG="-all" export PW_LOG=0
export PORTWINE_ACO=0 export PW_ACO=0
export PW_NO_VR=1
export PW_FILELOCK=1
######################################################################## ########################################################################
ADD_IN_START_PORTWINE () ADD_IN_START_PORTWINE ()
{ {
if [ "${var_dxvk_on}" = "0" ]
then ###OPENGL###
export PROTON_USE_WINED3D=1
export PW_DXGI_FOR_VKD3D=1
export PROTON_NO_D9VK=0
export PROTON_NO_D3D11=0
export PROTON_NO_D3D10=0
export PROTON_OLD_GL_STRING=0
else ###DXVK###
export PROTON_USE_WINED3D=0
export PW_DXGI_FOR_VKD3D=0
export PROTON_NO_D9VK=0
export PROTON_NO_D3D11=0
export PROTON_NO_D3D10=0
export DXVK_ASYNC=0
fi
export launch_parameters="" export launch_parameters=""
cd "${PATH_TO_GAME}" cd "${PATH_TO_GAME}"
} }
......
data_from_portwine/scripts/wineboot deleted 100755 → 0
View file @ ad1a28a4
#!/bin/bash
# Author: PortWINE-Linux.ru
. "$(dirname "`readlink -f "$0"`")"/runlib
"${WINESERVER}" -k
rm -f ${link}/winetricks
"/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
chmod +x "${link}/winetricks"
sed -i '18a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${WINEDIR}/bin/wine" ' "${link}/winetricks"
sleep 1
"${PROTONRUN}" "run" "winecfg" | pwzen
STOP_PORTWINE
data_from_portwine/scripts/winecfg
View file @ 6a1df190
#!/bin/bash #!/bin/bash
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
runlib_path="$(dirname $(readlink -f "$0"))"/runlib . "$(dirname $(readlink -f "$0"))/runlib"
. "$runlib_path"
"${WINESERVER}" -k "${WINESERVER}" -k
START_PORTWINE START_PORTWINE
export WINEDEBUG="fixme-all" PW_LOG=1
if [ ! -z ${optirun_on} ] if [ ! -z ${optirun_on} ]
then then
${optirun_on} "${PROTONRUN}" "run" "winecfg" >&2 ${optirun_on} "${port_on_run}" "run" "winecfg" >&2
else else
"${PROTONRUN}" "run" "winecfg" >&2 "${port_on_run}" "run" "winecfg" >&2
fi fi
STOP_PORTWINE STOP_PORTWINE
data_from_portwine/scripts/winecmd
View file @ 6a1df190
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
START_PORTWINE START_PORTWINE
PW_LOG=1
if [ ! -z ${optirun_on} ] if [ ! -z ${optirun_on} ]
then then
"/usr/bin/xterm" -e '"${optirun_on}" "${PROTONRUN}" "run" "cmd"' "/usr/bin/xterm" -e '"${optirun_on}" "${port_on_run}" "run" "cmd"'
else else
"/usr/bin/xterm" -e '"${PROTONRUN}" "run" "cmd"' "/usr/bin/xterm" -e '"${port_on_run}" "run" "cmd"'
fi fi
STOP_PORTWINE STOP_PORTWINE
data_from_portwine/scripts/winefile
View file @ 6a1df190
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
START_PORTWINE START_PORTWINE
export WINEDEBUG="fixme-all" PW_LOG=1
if [ ! -z ${optirun_on} ] if [ ! -z ${optirun_on} ]
then then
${optirun_on} "${PROTONRUN}" "run" "explorer" ${optirun_on} "${port_on_run}" "run" "explorer"
else else
"${PROTONRUN}" "run" "explorer" "${port_on_run}" "run" "explorer"
fi fi
STOP_PORTWINE STOP_PORTWINE
data_from_portwine/scripts/winereg
View file @ 6a1df190
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k "${WINESERVER}" -k
START_PORTWINE START_PORTWINE
"${PROTONRUN}" "run" "regedit" "${port_on_run}" "run" "regedit"
STOP_PORTWINE STOP_PORTWINE
data_from_portwine/scripts/winetricks-q-force
View file @ 6a1df190
...@@ -2,11 +2,15 @@ ...@@ -2,11 +2,15 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname "`readlink -f "$0"`")"/runlib . "$(dirname "`readlink -f "$0"`")"/runlib
"${WINESERVER}" -k "${WINESERVER}" -k
wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | perl -pe 's;^.*/proc/(\d+)/exe.*$;$1;g;')
if ! [ -z "${wine_pids}" ] ; then
kill -9 ${wine_pids}
fi
rm -f ${link}/winetricks rm -f ${link}/winetricks
"/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks "/usr/bin/xterm" -e wget -T 3 --output-document="${link}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
chmod +x "${link}/winetricks" chmod +x "${link}/winetricks"
sed -i '2a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${PORT_WINE_PATH}/data/wine/bin/wine" ' "${link}/winetricks" sed -i '18a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${WINEDIR}/bin/wine" ' "${link}/winetricks"
sleep 1 sleep 1
export WINEDEBUG="" export PW_LOG=1
"/usr/bin/xterm" -e "sh ${link}/winetricks -q --force" "/usr/bin/xterm" -e "sh ${link}/winetricks -q --force"
STOP_PORTWINE STOP_PORTWINE
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