diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf
index 8d967553..2c68c9ea 100755
--- a/data_from_portwine/dxvk.conf
+++ b/data_from_portwine/dxvk.conf
@@ -24,11 +24,11 @@
#
# Supported values: Any four-digit hex number.
-dxgi.customDeviceId = 10de
-dxgi.customVendorId = 10de
+# dxgi.customDeviceId = 10de
+# dxgi.customVendorId = 10de
-d3d9.customDeviceId = 10de
-d3d9.customVendorId = 10de
+# d3d9.customDeviceId = 10de
+# d3d9.customVendorId = 10de
# Report Nvidia GPUs as AMD GPUs by default. This is enabled by default
@@ -36,7 +36,7 @@ d3d9.customVendorId = 10de
#
# Supported values: True, False
-dxgi.nvapiHack = True
+# dxgi.nvapiHack = True
# Override maximum amount of device memory and shared system memory
@@ -117,7 +117,7 @@ dxgi.nvapiHack = True
#
# Supported values: Any number between 8 and 64
-d3d11.maxTessFactor = 8
+#d3d11.maxTessFactor = 8
# Enables relaxed pipeline barriers around UAV writes.
@@ -136,8 +136,8 @@ d3d11.maxTessFactor = 8
#
# Supported values: Any number between 0 and 16
-d3d11.samplerAnisotropy = 8
-d3d9.samplerAnisotropy = 8
+#d3d11.samplerAnisotropy = 8
+#d3d9.samplerAnisotropy = 8
# Declares vertex positions as invariant in order to solve
diff --git a/data_from_portwine/icons/debug.svg b/data_from_portwine/icons/debug.svg
deleted file mode 100644
index 308f9adf..00000000
--- a/data_from_portwine/icons/debug.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
diff --git a/data_from_portwine/icons/delete.svg b/data_from_portwine/icons/delete.svg
deleted file mode 100644
index 903055b9..00000000
--- a/data_from_portwine/icons/delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data_from_portwine/icons/info.svg b/data_from_portwine/icons/info.svg
deleted file mode 100644
index 8fa44194..00000000
--- a/data_from_portwine/icons/info.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data_from_portwine/icons/restart.svg b/data_from_portwine/icons/restart.svg
deleted file mode 100644
index 76b93255..00000000
--- a/data_from_portwine/icons/restart.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data_from_portwine/icons/settings.svg b/data_from_portwine/icons/settings.svg
deleted file mode 100644
index 822e2193..00000000
--- a/data_from_portwine/icons/settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data_from_portwine/scripts/create_shortcut b/data_from_portwine/scripts/create_shortcut
new file mode 100755
index 00000000..838ab256
--- /dev/null
+++ b/data_from_portwine/scripts/create_shortcut
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Author: PortWINE-Linux.ru
+. "$(dirname $(readlink -f "$0"))/runlib"
+########################################################################
+PORTPROTON_NAME=$(zenity --entry --text "Введите название ярлыка:")
+if [ $? -eq 1 ];then exit 1; fi
+PORTPROTON_EXE=$(zenity --file-selection --file-filter=""*.exe" "*.bat"" --title="Создаем ярлык. Выберите файл запуска..." --filename="${PORT_WINE_PATH}/data/pfx/drive_c/")
+if [ $? -eq 1 ];then exit 1; fi
+PORTPROTON_IMG=$(zenity --file-selection --file-filter=*.png --title="Создаем ярлык. Выберите иконку PNG формата..." --filename="${HOME}/")
+if [ $? -eq 1 ];then exit 1; fi
+########################################################################
+cp -f "${PORTPROTON_IMG}" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"
+name_desktop="${PORTPROTON_NAME}"
+echo "[Desktop Entry]" \
+> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Name=${PORTPROTON_NAME}" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Exec="sh \"${PORT_WINE_PATH}/data/scripts/start\" \"${PORTPROTON_EXE}\""" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Type=Application" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Categories=Game" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "StartupNotify=true" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Path="${PORT_WINE_PATH}/data/scripts/"" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Icon="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"" \
+>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+########################################################################
+`zenity --info --title "Успешно." --text "Ярлык создан в корневом каталоге порта." --no-wrap ` > /dev/null 2>&1
diff --git a/data_from_portwine/scripts/setup b/data_from_portwine/scripts/setup
index 7029e63b..69882da6 100755
--- a/data_from_portwine/scripts/setup
+++ b/data_from_portwine/scripts/setup
@@ -10,17 +10,19 @@ then
mkdir -p "/home/${USER}/.local/share/applications"
fi
-name_desktop="${gamename}"
-echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Exec="${PORT_WINE_PATH}/data/scripts/start"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Path="${PORT_WINE_PATH}/data/scripts/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Icon="${PORT_WINE_PATH}/data/img/w.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
-cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
+if [ ! -z ${gamename} ]; then
+ name_desktop="${gamename}"
+ echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Exec="${PORT_WINE_PATH}/data/scripts/start"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Path="${PORT_WINE_PATH}/data/scripts/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Icon="${PORT_WINE_PATH}/data/img/w.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
+fi
name_desktop="readme"
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -34,7 +36,7 @@ chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
rm -fR "${PORT_WINE_PATH}/Settings"
mkdir -p "${PORT_WINE_PATH}/Settings"
-for name_desktop in "winecfg" "winefile" "wineboot" "winecmd" "winereg"
+for name_desktop in "winecfg" "winefile" "winecmd" "winereg" "create_shortcut"
do
echo ""[Desktop Entry]"
"Name=${name_desktop}"
@@ -49,15 +51,15 @@ done
for name_desktop in "debug" "reset"
do
-echo ""[Desktop Entry]"
-"Name=${name_desktop}"
-"Exec="${PORT_WINE_PATH}/data/scripts/${name_desktop}""
-"Type=Application"
-"Categories=Game"
-"StartupNotify=true"
-"Path="${PORT_WINE_PATH}/data/scripts/""
-"Icon="${PORT_WINE_PATH}/data/img/s.png""" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
-chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo ""[Desktop Entry]"
+ "Name=${name_desktop}"
+ "Exec="${PORT_WINE_PATH}/data/scripts/${name_desktop}""
+ "Type=Application"
+ "Categories=Game"
+ "StartupNotify=true"
+ "Path="${PORT_WINE_PATH}/data/scripts/""
+ "Icon="${PORT_WINE_PATH}/data/img/s.png""" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
done
echo ""[Desktop Entry]"
diff --git a/data_from_portwine/scripts/start b/data_from_portwine/scripts/start
index 2b93ac54..617e0427 100755
--- a/data_from_portwine/scripts/start
+++ b/data_from_portwine/scripts/start
@@ -3,9 +3,17 @@
. "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k
START_PORTWINE
-if [ ! -z ${optirun_on} ]; then
- ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
-else
- "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
+if [ ! -z "$1" ]; then
+ if [ ! -z ${optirun_on} ]; then
+ ${optirun_on} "${port_on_run}" "run" "$1" &>/dev/null
+ else
+ "${port_on_run}" "run" "$1" &>/dev/null
+ fi
+else
+ if [ ! -z ${optirun_on} ]; then
+ ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
+ else
+ "${port_on_run}" "run" "${gamestart}" ${launch_parameters} &>/dev/null
+ fi
fi
STOP_PORTWINE
diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars
index accee752..b328135b 100755
--- a/data_from_portwine/scripts/vars
+++ b/data_from_portwine/scripts/vars
@@ -2,20 +2,24 @@
# License GPL
# Author: Tergoev M.A.
########################################################################
-export portname="PortXXX"
-export gamename="GameXXX"
-export gamedir="GameDirXXX"
-export porturl="http://portwine-linux.ru/"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
+export portname=
+export gamename=
+export gamedir=
+if [ ! -z ${gamedir} ]; then
+ export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
+else
+ export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/"
+fi
export gamestart="${PATH_TO_GAME}/.exe"
+export porturl="http://portwine-linux.ru/"
########################################################################
#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
export STAGING_SHARED_MEMORY=1
export PW_FORCE_LARGE_ADDRESS_AWARE=1
-export PW_USE_SECCOMP=0
+export PW_USE_SECCOMP=1
export WINEDLLOVERRIDES="winemenubuilder.exe=d"
export PW_LOG=0
-export PW_ACO=0
+export PW_ACO=1
export PW_NO_VR=1
export PW_FILELOCK=1
########################################################################