diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 6a1f90c..112136b 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -2,19 +2,39 @@ ----------------------------------------- В планах: * создать ветку beta на github и сделать выбор версии внутри порта -* проверить Overwatch * перенести reset в GUI PortProton * добавить фикс установки dotnet * добавить кнопку очистки префикса в PortProton * проверка версий и обновления скриптов из https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.zip * EDIT DB открывается не у всех * пересоздать удаление PortProton (чистка ярлыков в меню с помощью grep "путь до порта") -* проверить windows steam под PortProton +* проверить windows steam и под PortProton работают только с Proton GE * создать defaut префикс и сделать авто симлинки в другие префиксы (games, programm files, users) * иконка в трей для PortProton * добавить контроль за окнами для правильного отключения прогресс бара +* добавлено отображение скорости интернета и примерный остаток времени при скачивании библиотек libs, gecko, mono * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###PortProton-85### 27.05.2021 ###Scripts version 1090### +* для подготовки к релизу используется стабилная версия wine: Proton 6.3-4 +* до 4-x прибавка в ФПС в играх DX12 (на моем железе: HZD - x4; Graven - x2; Cyberpunk2077 - x1,25) +* глобальное изменение использование переменных (системных, wine и vulkan) +* в лог файл добавлена информация о текущей версии скриптов и используется ли RUNTIME +* возврат оригинальных значений системных переменных: PATH, LD_LIBRARY_PATH после окончания использования порта +* HOTFIX - убрано повторное исполнение функции START_PORTWINE во время запуска debug +* HOTFIX - исправлены возможные проблемы старых игр использующе WMF +* HOTFIX - ошибки скачивания vcrun2019 на чистом префиксе + +###PortProton-84### 23.05.2021 ###Scripts version 1089### - BETA +* обновлен WINE до версии Proton 6.9 GE 1 +* контейнерный режим включен по умолчанию и отключается с помощью раскомментирования переменной в скрипте var #export PW_FORCE_DISABLED_RUNTIME=1 +* более чем в 2 раза увеличена производительность игр под VKD3D (Cyberpunk2077 и т.п.) за счет исползования dxgi из dxvk под vkd3d +* для префикса по умолчанию включена версия windows 10 +* реализовано создание символьных ссылок с библиотек gstreamer в контейнер runtime для исправления ошибок WMF (gst) + +###Scripts version 1088### +* реализовано создание символьных ссылок с библиотек wine в контейнер runtime для исправления ошибок XACT (faudio) + ###Scripts version 1087### * добавлен вопрос об обновлении скриптов * HOTFIX - полностью убрана переменная WINE_WIN_START diff --git a/data_from_portwine/dxvk.conf b/data_from_portwine/dxvk.conf index 9ea1ce5..14ef564 100644 --- a/data_from_portwine/dxvk.conf +++ b/data_from_portwine/dxvk.conf @@ -2,7 +2,7 @@ # rather than when creating the swap chain. Some games that start # rendering with a different graphics API may require this option, # or otherwise the window may stay black. -# +# # Supported values: True, False # dxgi.deferSurfaceCreation = False @@ -12,7 +12,7 @@ # Enforce a stricter maximum frame latency. Overrides the application # setting specified by calling IDXGIDevice::SetMaximumFrameLatency. # Setting this to 0 will have no effect. -# +# # Supported values : 0 - 16 # dxgi.maxFrameLatency = 0 @@ -73,7 +73,7 @@ # True enables the mailbox present mode in case regular Vsync is disabled. # This should avoid tearing, but may be unsupported on some systems # or require setting dxgi.numBackBuffers to a higher value in order -# to work properly. +# to work properly. # # False enables the relaxed fifo present mode in case regular Vsync is enabled. # This should result in tearing but reduce stutter if FPS are too low, @@ -116,14 +116,14 @@ # Overrides the maximum allowed tessellation factor. This can be used to # improve performance in titles which overuse tessellation. -# +# # Supported values: Any number between 8 and 64 # d3d11.maxTessFactor = 0 # Enables relaxed pipeline barriers around UAV writes. -# +# # This may improve performance in some games, but may also introduce # rendering issues. Please don't report bugs with the option enabled. # @@ -135,7 +135,7 @@ # Overrides anisotropic filtering for all samplers. Set this to a positive # value to enable AF for all samplers in the game, or to 0 in order to # disable AF entirely. Negative values will have no effect. -# +# # Supported values: Any number between 0 and 16 # d3d11.samplerAnisotropy = -1 @@ -168,7 +168,7 @@ # Sets number of pipeline compiler threads. -# +# # Supported values: # - 0 to automatically determine the number of threads to use # - any positive number to enforce the thread count @@ -177,13 +177,13 @@ # Toggles raw SSBO usage. -# +# # Uses storage buffers to implement raw and structured buffer # views. Enabled by default on hardware which has a storage # buffer offset alignment requirement of 4 Bytes (e.g. AMD). # Enabling this may improve performance, but is not safe on # hardware with higher alignment requirements. -# +# # Supported values: # - Auto: Don't change the default # - True, False: Always enable / disable @@ -192,13 +192,13 @@ # Toggles early discard. -# +# # Uses subgroup operations to determine whether it is safe to # discard fragments before the end of a fragment shader. This # is enabled by default on all drivers except RADV and Nvidia. # Enabling this may improve or degrade performance depending # on the game and hardware, or cause other issues. -# +# # Supported values: # - Auto: Don't change the default # - True, False: Always enable / disable @@ -221,19 +221,19 @@ # Sets enabled HUD elements -# +# # Behaves like the DXVK_HUD environment variable if the # environment variable is not set, otherwise it will be # ignored. The syntax is identical. -# dxvk.hud = +# dxvk.hud = # Reported shader model # # The shader model to state that we support in the device # capabilities that the applicatation queries. -# +# # Supported values: # - 1: Shader Model 1 # - 2: Shader Model 2 @@ -243,7 +243,7 @@ # Evict Managed on Unlock -# +# # Decides whether we should evict managed resources from # system memory when they are unlocked entirely. # @@ -254,7 +254,7 @@ # DPI Awareness -# +# # Decides whether we should call SetProcessDPIAware on device # creation. Helps avoid upscaling blur in modern Windows on # Hi-DPI screens/devices. @@ -266,7 +266,7 @@ # Strict Constant Copies -# +# # Decides whether we should always copy defined constants to # the UBO when relative addressing is used, or only when the # relative addressing starts a defined constant. @@ -278,7 +278,7 @@ # Strict Pow -# +# # Decides whether we have an opSelect for handling pow(0,0) = 0 # otherwise it becomes undefined. # @@ -309,7 +309,7 @@ # - Memory Tracking Testing: True, False # d3d9.maxAvailableMemory = 1024 -d3d9.memoryTrackTest = False +# d3d9.memoryTrackTest = False # Force enable/disable floating point quirk emulation diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall index 9a64198..6b1fec1 100644 --- a/data_from_portwine/scripts/autoinstall +++ b/data_from_portwine/scripts/autoinstall @@ -10,6 +10,7 @@ export PW_NO_WRITE_WATCH=0 export PW_VULKAN_USE=0 export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 +unset PORTWINE_CREATE_SHORTCUT_NAME PW_WGC () { export LAUNCH_PARAMETERS=("/SILENT" "/SP-") @@ -20,7 +21,8 @@ PW_WGC () { then PW_START_PROGRESS_BAR_CS "Starting WGC installation..." PW_RUN "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc.exe" + portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc_api/wgc_api.exe" + export PORTWINE_CREATE_SHORTCUT_NAME="Wargaming Game Center" try_remove_file "${PW_AUTOINSTALL_EXE}" KILL_PORTWINE PORTWINE_CREATE_SHORTCUT diff --git a/data_from_portwine/scripts/portwine_db/Alien_Isolation b/data_from_portwine/scripts/portwine_db/Alien_Isolation new file mode 100644 index 0000000..1ade29e --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Alien_Isolation @@ -0,0 +1,6 @@ +#!/bin/bash +#Author: garrett +#AI.exe +#Rating=5 +######################################################## +export PW_VULKAN_USE=dxvk diff --git a/data_from_portwine/scripts/portwine_db/Arthur b/data_from_portwine/scripts/portwine_db/Arthur new file mode 100644 index 0000000..3cb31e4 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Arthur @@ -0,0 +1,41 @@ +#!/bin/bash +#Author: akai +#Arthur.exe +#Rating=1-5 +######################################################## +export PW_VULKAN_USE=dxvk +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VKD3D_FEATURE_LEVEL=1 +##export PW_DXGI_FROM_DXVK=1 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +export PULSE_LATENCY_MSEC=90 # Fix crackling audio in games +##export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_LOG=1 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 index a69cc63..c148383 100644 --- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 +++ b/data_from_portwine/scripts/portwine_db/Cyberpunk2077 @@ -24,7 +24,7 @@ export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe=" export PULSE_LATENCY_MSEC=40 # Fix crackling audio in games export LAUNCH_PARAMETERS=("--launcher-skip") # Additional launch options ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI -##export VKD3D_CONFIG=force_bindless_texel_buffer +export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP ##export PW_VIRTUAL_DESKTOP=1 ##export DXVK_HUD=fps,devinfo diff --git a/data_from_portwine/scripts/portwine_db/DOOMx64vk b/data_from_portwine/scripts/portwine_db/DOOMx64vk new file mode 100644 index 0000000..a25543d --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/DOOMx64vk @@ -0,0 +1,11 @@ +#!/bin/bash +#Author: nix +#DOOMx64.exe +#DOOMx64vk.exe +#Rating=1-5 +######################################################## +export PW_VULKAN_USE=dxvk +#####################examples########################### +export PW_COMMENT_DB="DOOM 2016" +export PW_DLL_INSTALL="xact xact_x64 vcrun2019" +export WINEDLLOVERRIDES="xaudio2_8=n" diff --git a/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman b/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman index 8a61fdf..3a8454f 100644 --- a/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman +++ b/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman @@ -3,7 +3,7 @@ #DetroitBecomeHuman.exe #Rating=1-5 ################################################ -export PW_VULKAN_USE=dxvk -export PW_FORCE_USE_VSYNC=0 +export PW_VULKAN_USE=vkd3d +export PW_FORCE_USE_VSYNC=0 export PW_WINDOWS_VER="10" #export PW_VIRTUAL_DESKTOP=1 diff --git a/data_from_portwine/scripts/portwine_db/Game-TS3 b/data_from_portwine/scripts/portwine_db/Game-TS3 deleted file mode 100644 index b92cdc0..0000000 --- a/data_from_portwine/scripts/portwine_db/Game-TS3 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -#Author: -#Game-TS3.exe -#Rating=5 -################################################ -export PW_VULKAN_USE=0 -export LAUNCH_PARAMETERS="" diff --git a/data_from_portwine/scripts/portwine_db/Horizon Zero Dawn b/data_from_portwine/scripts/portwine_db/Horizon Zero Dawn index 8de4f40..dd003dd 100755 --- a/data_from_portwine/scripts/portwine_db/Horizon Zero Dawn +++ b/data_from_portwine/scripts/portwine_db/Horizon Zero Dawn @@ -5,5 +5,5 @@ ################################################ export PW_VULKAN_USE=vkd3d #dxvk or vkd3d export WINEDLLOVERRIDES="" -export PW_DLL_INSTALL="vcrun2017" +export PW_DLL_INSTALL="vcrun2019" export LAUNCH_PARAMETERS="-EpicPortal" diff --git a/data_from_portwine/scripts/portwine_db/MikuMikuDance b/data_from_portwine/scripts/portwine_db/MikuMikuDance new file mode 100644 index 0000000..8889bb8 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/MikuMikuDance @@ -0,0 +1,38 @@ +#!/bin/bash +#Author: test +#MikuMikuDance.exe +#Rating=1-5 +######################################################## +export PW_VULKAN_USE=dxvk +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_USE_BUILD_IN_DXGI=1 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_LOG=1 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/RDR2 b/data_from_portwine/scripts/portwine_db/RDR2 index f99edd5..d870d7c 100644 --- a/data_from_portwine/scripts/portwine_db/RDR2 +++ b/data_from_portwine/scripts/portwine_db/RDR2 @@ -1,11 +1,11 @@ #!/bin/bash -#Author: +#Author: #RDR2.exe -#PlayRDR2.exe +#PlayRDR2.exe #Rating=? ################################################ export PW_VULKAN_USE=vkd3d -export WINEDLLOVERRIDES="amd_ags_x64=b,n" +export WINEDLLOVERRIDES="vulkan-1=n" export PW_DXGI_FROM_DXVK=1 export LAUNCH_PARAMETERS="-adapter=1 -vulkan -width=1920 -height=1080 -USEALLAVAILABLECORES -cpuLoadRebalancing -ignorepipelinecach" export PULSE_LATENCY_MSEC=60 diff --git a/data_from_portwine/scripts/portwine_db/Sam3 b/data_from_portwine/scripts/portwine_db/Sam3 new file mode 100644 index 0000000..f22d179 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/Sam3 @@ -0,0 +1,42 @@ +#!/bin/bash +#Author: xihnik +#Sam3.exe +#Rating=3 +######################################################## +export PW_DLL_INSTALL="d3dx9 vcrun2013 d3dcompiller_47" +export PULSE_LATENCY_MSEC=150 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export PW_DXR_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_NVAPI_DISABLE=1 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VKD3D_FEATURE_LEVEL=1 +##export PW_DXGI_FROM_DXVK=1 +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_LOG=1 # Enable debug mode fo terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 881cda7..223c1e1 100644 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -11,15 +11,13 @@ ##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options ##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL -##export PW_DXVK_VER=1.8.1 -##export PW_VKD3D_VER=2.2 ##export PW_DXR_ON=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_NVAPI_DISABLE=1 ##export PW_OLD_GL_STRING=1 ##export PW_HIDE_NVIDIA_GPU=1 ##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT -##export PW_DXGI_FROM_DXVK=1 +##export PW_USE_BUILD_IN_DXGI=1 ##export PW_VIRTUAL_DESKTOP=1 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue ##export ENABLE_VKBASALT=1 diff --git a/data_from_portwine/scripts/portwine_db/s1_sp64_ship b/data_from_portwine/scripts/portwine_db/s1_sp64_ship new file mode 100644 index 0000000..e435691 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/s1_sp64_ship @@ -0,0 +1,42 @@ +#!/bin/bash + #Author: xihnik + #s1_sp64_ship.exe + #Rating=1-5 + ################################################ + export PW_VULKAN_USE=dxvk + export PW_DLL_INSTALL="vcrun2019 d3dx9" + #export PW_NO_FSYNC=1 + export PW_WINDOWS_VER=7 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL +##export PW_DXVK_VER=1.8.1 +##export PW_VKD3D_VER=2.2 +##export WINEDLLOVERRIDES="blabla=n,b" +##export PW_DLL_INSTALL="vcrun2019 vcrun6" # Install DDL in port prefix (used winetricks) +##export PW_LOG=0 # Enable debug mode fo terminal +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives +##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_USE_TERMINAL=0 # Force run in terminal +##export PW_OLD_GL_STRING=0 +##export PW_NVAPI_DISABLE=1 +##export PW_VKD3D_FEATURE_LEVEL=0 +##export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HIDE_NVIDIA_GPU=0 +##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod +##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_VIRTUAL_DESKTOP=1 +##export DXVK_HUD=fps,devinfo +##export PW_HEAP_DELAY_FREE=0 +##export PW_DXGI_FROM_DXVK=0 +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##ADD_IN_START_PORTWINE () { commands ; } diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 11f60a5..bbe1ebc 100644 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -1,18 +1,16 @@ #!/bin/bash #Author: PortWINE #wgc.exe +#wgc_api.exe #Rating=5 +export PW_COMMENT_DB="Wargaming Game Center" ################################################ #export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options #export PW_USE_TERMINAL=1 -#export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP +export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP #export PW_NVAPI_DISABLE=1 -#export WINEDLLOVERRIDES="xaudio2_7=n" +#export WINEDLLOVERRIDES="ucrtbase,xaudio2_7,xaudio2_8=n" export PW_DLL_INSTALL="lucida vcrun2019" # Install DDL in port prefix (used winetricks) ##export PW_GUI_DISABLED_CS=1 -export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG - -ADD_IN_START_PORTWINE () { - sed -i 's/true/false/g' "$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/preferences.xml" -} +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 9094e53..7d8503e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -12,7 +12,7 @@ echo ' ' [ $(id -u) = 0 ] && echo "Do not run this script as root!" && zenity --error --text "Do not run this script as root!" && exit 1 if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then - echo "You will need to install: zenity, and restart the port." + echo "You will need to install: zenity, and restart the port." xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 fi pw_ping_test () { @@ -26,7 +26,7 @@ print_info () { echo "INFO: $@" } print_var () { - for vp in $@ ; do echo "${vp}=${!vp}" ; done + for vp in $@ ; do echo "${vp}=${!vp}" ; done } try_copy_file () { if [ ! -f "$1" ] ; then print_info "file $1 not found for copy" && return 1 @@ -46,31 +46,30 @@ try_copy_dir () { cp -fr "$1" "$2" [ "$?" != 0 ] && print_error "failed to copy directory $1 to $2" || return 0 fi - return 1 + return 1 } try_remove_file () { if [ -f "$1" ] ; then rm -f "$1" [ "$?" != 0 ] && print_error "failed to remove file $1" || return 0 fi - return 1 + return 1 } try_remove_dir () { if [ -d "$1" ] ; then rm -fr "$1" [ "$?" != 0 ] && print_error "failed to remove directory $1" || return 0 fi - return 1 + return 1 } try_force_link_file () { if [ ! -f "$1" ] ; then print_info "file $1 not found for link" elif [ -z "$2" ] ; then print_error "no way to link file $1" else - [ -f "$2" ] && rm -f "$2" - ln -s "$1" "$2" + ln -sf "$1" "$2" [ "$?" != 0 ] && print_error "failed to link file $1 to $2" || return 0 fi - return 1 + return 1 } try_force_link_dir () { if [ ! -d "$1" ] ; then print_info "directory $1 not found for link" @@ -79,18 +78,18 @@ try_force_link_dir () { ln -sf "$1" "$2" [ "$?" != 0 ] && print_error "failed to link directory $1 to $2" || return 0 fi - return 1 + return 1 } try_download () { set -o pipefail wget -c -t 5 -T 2 "$1" --output-document="$2" 2>&1 | \ sed -u 's/^[a-zA-Z\-].*//; s/.* \{1,2\}\([0-9]\{1,3\}\)%.*/\1\n#Downloading... \1%/; s/^20[0-9][0-9].*/#Done./' | \ zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 - [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 + [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } try_download_silent () { wget -c -t 5 -T 2 "$1" --output-document="$2" - [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 + [ "$?" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 } zenity_error_download () { `zenity --error --title "Error..." --text "You will need to check internet connettion,\nand press OK for repeet download" --no-wrap ` > /dev/null 2>&1 @@ -98,31 +97,31 @@ zenity_error_download () { create_new_dir () { if [ ! -d "$1" ] ; then mkdir -p "$1" - fi + fi } var_winedlloverride_update () { - if [ ! -z "${WINEDLLOVERRIDES}" ] + if [ ! -z "${WINEDLLOVERRIDES}" ] then export WINEDLLOVERRIDES="${1};${WINEDLLOVERRIDES}" else export WINEDLLOVERRIDES="${1}" - fi + fi } var_vkd3d_config_update () { - if [ ! -z "${VKD3D_CONFIG}" ] + if [ ! -z "${VKD3D_CONFIG}" ] then export VKD3D_CONFIG="${1};${VKD3D_CONFIG}" - else export VKD3D_CONFIG="${1}" - fi + else export VKD3D_CONFIG="${1}" + fi } unpack_tar_xz () { set -o pipefail - tar -Jxvf "$1" -C "$2" | sszen - [ "${PIPESTATUS[0]}" != 0 ] && print_error "File unpacking error." && return 1 || return 0 + tar -Jxvf "$1" -C "$2" | sszen + [ "${PIPESTATUS[0]}" != 0 ] && print_error "File unpacking error." && return 1 || return 0 } pw_mangohud_check () { export RUN_MANGOHUD="" export MANGOHUD=0 export MANGOHUD_DLSYM=0 if [ -x "`which mangohud 2>/dev/null`" ] && [ "${PW_MANGOHUD}" == "1" ] ; then - if [ "${PW_VULKAN_USE}" = "0" ]; then + if [ "${PW_VULKAN_USE}" = "0" ]; then export MANGOHUD_DLSYM=1 export RUN_MANGOHUD=mangohud else @@ -135,6 +134,7 @@ pw_clear_pfx () { try_remove_file "${WINEPREFIX}/user.reg" try_remove_file "${WINEPREFIX}/userdef.reg" try_remove_file "${WINEPREFIX}/winetricks.log" + try_remove_file "${WINEPREFIX}/.update-timestamp" try_remove_dir "${WINEPREFIX}/drive_c/windows/" } sszen() { @@ -156,8 +156,8 @@ PW_STOP_PROGRESS_BAR () { done } PW_LOAD_LIBS () { - if [ ! -e "${WINELIB}/run-in-soldier" ] || [ ! -e "${WINELIB}/runtime/bin/yad" ] || [ ! -e "${WINELIB}/runtime/lib/p7zip/7zr" ] \ - || [ ! -e "${WINELIB}/runtime/bin/vkcube" ] || [ ! -e "${WINELIB}/runtime/bin/xterm" ] || \ + if [ ! -e "${PW_WINELIB}/run-in-soldier" ] || [ ! -e "${PW_WINELIB}/runtime/bin/yad" ] || [ ! -e "${PW_WINELIB}/runtime/lib/p7zip/7zr" ] \ + || [ ! -e "${PW_WINELIB}/runtime/bin/vkcube" ] || [ ! -e "${PW_WINELIB}/runtime/bin/xterm" ] || \ [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then print_info "Download and install libraries..." if try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${pw_libs_ver}/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ; then @@ -176,19 +176,20 @@ PW_LOAD_LIBS () { --no-wrap ` > /dev/null 2>&1 && PW_LOAD_LIBS fi fi - export pw_yad="${WINELIB}/runtime/bin/yad" - export pw_zstd="${WINELIB}/runtime/bin/zstd" - export pw_7z="${WINELIB}/runtime/lib/p7zip/7zr" + export pw_yad="${PW_WINELIB}/runtime/bin/yad" + export pw_zstd="${PW_WINELIB}/runtime/bin/zstd" + export pw_7z="${PW_WINELIB}/runtime/lib/p7zip/7zr" if [ -x "`which xterm 2>/dev/null`" ]; then export SYS_XTERM=`which xterm` export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e" else - export PW_XTERM="${WINELIB}/runtime/bin/xterm -geometry 159x37 -e" + export PW_XTERM="${PW_WINELIB}/runtime/bin/xterm -geometry 159x37 -e" fi } PW_DOWNLOAD_MONO () { if [ ! -d "${HOME}/.PortWINE/mono/wine-mono-${mono_ver}" ] ; then + export url_mono="https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${mono_ver}/wine-mono-${mono_ver}-x86.tar.xz" echo "######################################################" print_info "Download and install wine mono..." if try_download "${url_mono}" "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz" ; then @@ -206,6 +207,7 @@ PW_DOWNLOAD_MONO () { } PW_DOWNLOAD_GECKO () { if [ ! -d "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86" ] ; then + export url_gecko_x86="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86.tar.xz" echo "######################################################" echo "Download and install wine gecko x86..." if try_download "${url_gecko_x86}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz" ; then @@ -220,7 +222,8 @@ PW_DOWNLOAD_GECKO () { zenity_error_download && PW_DOWNLOAD_GECKO fi fi - if [ ! -d "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86_64" ] ; then + if [ ! -d "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86_64" ] ; then + export url_gecko_x86_64="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86_64.tar.xz" echo "######################################################" echo "Download and install wine gecko x86_64..." if try_download "${url_gecko_x86_64}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz" ; then @@ -247,62 +250,52 @@ START_PORTWINE () elif [ -x "`which xterm 2>/dev/null`" ]; then export PW_TERM="${PW_XTERM}" else export PW_TERM="${PW_XTERM}" fi - - try_remove_dir "${PORT_WINE_PATH}/data/vulkan" - create_new_dir "${PW_VULKAN_DLL}" - - export url_dxvk="https://github.com/doitsujin/dxvk/releases/download/v${PW_DXVK_VER}/dxvk-${PW_DXVK_VER}.tar.gz" - if [ ! -d "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}" ] ; then - if pw_ping_test ; then - if try_download "${url_dxvk}" "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" ; then - tar -zxvf "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" -C "${PW_VULKAN_DLL}/" - try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" - else - try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" - `zenity --error --title "Error..." --text "You will need check internet connettion,\nor change DXVK version in db file!" --no-wrap ` > /dev/null 2>&1 - PW_EDIT_DB & exit 1 - fi - else - export PW_DXVK_VER="${PW_DEF_DXVK_VER}" - fi - fi - - export url_vkd3d="https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${PW_VKD3D_VER}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" - if [ ! -d "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}" ] ; then - if pw_ping_test ; then - if try_download "${url_vkd3d}" "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" ; then - tar -C "${PW_VULKAN_DLL}/" -I "${pw_zstd}" -xvf "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" - try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" - else - try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" - `zenity --error --title "Error..." --text "You will need to change VKD3D version in db file!" --no-wrap ` > /dev/null 2>&1 - PW_EDIT_DB & exit 1 - fi - else - export PW_VKD3D_VER="${PW_DEF_VKD3D_VER}" - fi - fi - PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." export WINELOADER="${WINEDIR}/bin/wine" - export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" export WINESERVER="${WINEDIR}/bin/wineserver" + export WINEDLLPATH="${WINEDIR}/lib/wine" + for pw_winedllpath in "${WINEDIR}/lib/wine/i386-windows" "${WINEDIR}/lib64/wine" "${WINEDIR}/lib64/wine/x86_64-windows" "${WINEDIR}/lib/wine/x86_64-windows"; do + if [ -d "${pw_winedllpath}" ] + then export WINEDLLPATH="${pw_winedllpath}:${WINEDLLPATH}" + fi + done + if [ ! -z "${PW_SYS_PATH}" ] + then export PATH="${PW_SYS_PATH}" + else export PW_SYS_PATH="${PATH}" + fi + if [ ! -z "${PW_LDL_PATH}" ] + then export LD_LIBRARY_PATH="${PW_SYS_PATH}" + else export PW_LDL_PATH="${LD_LIBRARY_PATH}" + fi if [ ! -z "${PATH}" ] then export PATH="${WINEDIR}/bin:${PATH}" else export PATH="${WINEDIR}/bin" fi - if [ ! -z "${LD_LIBRARY_PATH}" ] - then export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}" - else export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib" + export LD_LIBRARY_PATH="${WINEDIR}/lib" + for pw_ld_library_path in "${WINEDIR}/lib/wine/i386-unix" "${WINEDIR}/lib64" "${WINEDIR}/lib64/wine/x86_64-unix" ; do + if [ -d "${pw_ld_library_path}" ] + then export LD_LIBRARY_PATH="${pw_ld_library_path}:${LD_LIBRARY_PATH}" + fi + done + if [ ! -z "${PW_FORCE_DISABLED_RUNTIME}" ] && [ "${PW_FORCE_DISABLED_RUNTIME}" != 0 ] ; then + export PW_RUNTIME="" + echo "RUNTIME is disabled" + else + export PW_RUNTIME="${PW_WINELIB}/run-in-soldier --remove-game-overlay --share-home --filesystem="${PORT_WINE_PATH}" --runtime=runtime --" + ln -sf "${WINEDIR}"/lib64/*so* "${PW_WINELIB}/runtime/lib/x86_64-linux-gnu/" + ln -sf "${WINEDIR}"/lib/*so* "${PW_WINELIB}/runtime/lib/i386-linux-gnu/" + echo "RUNTIME is enabled" fi export WINE="${WINELOADER}" - export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/gstreamer-1.0" export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}" export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz + export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" + export STAGING_SHARED_MEMORY=1 + export PW_FORCE_LARGE_ADDRESS_AWARE=1 if [ ! -z "${PW_LOG}" ] && [ "${PW_LOG}" != 0 ] ; then export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" @@ -377,18 +370,9 @@ START_PORTWINE () if [ ! -z "${PW_NVIDIA}" ] && [ "${check_optimus_manager}" != "intel" ]; then if [ "${check_optimus_manager}" = "nvidia" ]; then export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json - elif [ -x "`which primusrun 2>/dev/null`" ]; then - export optirun_on="primusrun" - export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json - elif [ -x "`which optirun 2>/dev/null`" ]; then - export optirun_on="optirun -b primus" - export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json - elif [ -x "`which prime-run 2>/dev/null`" ]; then - export optirun_on="prime-run" - export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json + else + export __NV_PRIME_RENDER_OFFLOAD=1 fi - #export __NV_PRIME_RENDER_OFFLOAD=1 - export __GLX_VENDOR_LIBRARY_NAME=nvidia if [ ! -d "${PORT_WINE_TMP_PATH}"/gl_shader_cache ] ; then mkdir -p "${PORT_WINE_TMP_PATH}"/gl_shader_cache fi @@ -445,6 +429,9 @@ KILL_PORTWINE () { fi done fi + if [ ! -z `pgrep -a bwrap | grep ${portname} | head -n 1 | awk '{print $1}'` ] ; then + kill -n 9 `pgrep -a bwrap | grep ${portname} | head -n 1 | awk '{print $1}'` + fi } STOP_PORTWINE () { @@ -459,6 +446,14 @@ STOP_PORTWINE () { PW_STOP_PROGRESS_BAR try_remove_file "${PORT_SCRIPTS_PATH}/0" try_remove_file "${PORT_SCRIPTS_PATH}/1" + if [ ! -z "${PW_SYS_PATH}" ] ; then + export PATH="${PW_SYS_PATH}" + unset PW_SYS_PATH + fi + if [ ! -z "${PW_LDL_PATH}" ] ; then + export LD_LIBRARY_PATH="${PW_SYS_PATH}" + unset PW_LDL_PATH + fi } UPDATE_WINETRICKS () { @@ -486,29 +481,27 @@ RUN_WINETRICKS_FROM_DB () { PW_STOP_PROGRESS_BAR export PW_DLL_NEED_INSTALL="" export USE_WT_FROM_DB=0 - if [ -e "${WINEPREFIX}/winetricks.log" ] ; then - for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do - if [ "${need_install_dll_to_pfx}" == "vcrun2015" ] || [ "${need_install_dll_to_pfx}" == "vcrun2017" ] ; then - need_install_dll_to_pfx="vcrun2019" - sed -i '/vcrun2015/d' "${WINEPREFIX}/winetricks.log" - sed -i '/vcrun2017/d' "${WINEPREFIX}/winetricks.log" - elif [ "${need_install_dll_to_pfx}" == "vcrun2019" ] ; then - sed -i '/vcrun2015/d' "${WINEPREFIX}/winetricks.log" - sed -i '/vcrun2017/d' "${WINEPREFIX}/winetricks.log" - fi - grep "${need_install_dll_to_pfx}" "${WINEPREFIX}/winetricks.log" - if [ "$?" == "1" ] ; then - if [ -z "${PW_DLL_NEED_INSTALL}" ] - then export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx}" - else export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx} ${PW_DLL_NEED_INSTALL}" - fi - export USE_WT_FROM_DB=1 - fi - done - else - export PW_DLL_NEED_INSTALL="${PW_DLL_INSTALL}" - export USE_WT_FROM_DB=1 + if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then + touch "${WINEPREFIX}/winetricks.log" fi + for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do + if [ "${need_install_dll_to_pfx}" == "vcrun2015" ] || [ "${need_install_dll_to_pfx}" == "vcrun2017" ] ; then + need_install_dll_to_pfx="vcrun2019" + sed -i '/vcrun2015/d' "${WINEPREFIX}/winetricks.log" + sed -i '/vcrun2017/d' "${WINEPREFIX}/winetricks.log" + elif [ "${need_install_dll_to_pfx}" == "vcrun2019" ] ; then + sed -i '/vcrun2015/d' "${WINEPREFIX}/winetricks.log" + sed -i '/vcrun2017/d' "${WINEPREFIX}/winetricks.log" + fi + grep "${need_install_dll_to_pfx}" "${WINEPREFIX}/winetricks.log" + if [ "$?" == "1" ] ; then + if [ -z "${PW_DLL_NEED_INSTALL}" ] + then export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx}" + else export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx} ${PW_DLL_NEED_INSTALL}" + fi + export USE_WT_FROM_DB=1 + fi + done if [ "${USE_WT_FROM_DB}" == "1" ] ; then UPDATE_WINETRICKS PW_STOP_PROGRESS_BAR @@ -549,12 +542,12 @@ PW_UPDATE () { if [ ! -f "${PORT_WINE_TMP_PATH}/update_notifier" ] ; then echo "1" > "${PORT_WINE_TMP_PATH}/update_notifier" fi - read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier" + read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier" if [ "${update_not}" = "1" ] ; then if try_download_silent "${PW_FTP_URL}/current_version/${portname}_ver" "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" ; then read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_cur_ver" - if [ ! -z "${current_ver}" ] && [ "${current_ver}" -gt "${install_ver}" ] ; then + if [ ! -z "${current_ver}" ] && [ "${current_ver}" -gt "${install_ver}" ] ; then xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=230 --column="${inst_set}" --column "${port_upd3}" \ TRUE "${port_upd4}" \ FALSE "${port_upd5}" \ @@ -563,16 +556,16 @@ PW_UPDATE () { "${port_upd4}") KILL_PORTWINE # if try_download https://portwine-linux.ru/ftp/portwine/PortProton-$current_ver "${HOME}/.PortWINE/tmp/PortProton-$current_ver" ; then - # sh "${HOME}/.PortWINE/tmp/PortProton-$current_ver" + # sh "${HOME}/.PortWINE/tmp/PortProton-$current_ver" # try_remove_file "${HOME}/.PortWINE/tmp/PortProton-$current_ver" # fi & - xdg-open $porturl + xdg-open $porturl exit 0 ;; "${port_upd5}") - echo " " ;; + echo " " ;; "${port_upd6}") echo "0" > "${PORT_WINE_TMP_PATH}/update_notifier" ;; - esac + esac fi fi fi @@ -588,21 +581,21 @@ PW_UPDATE () { TRUE "${port_time4}" \ FALSE "${port_time5}" \ FALSE "${port_time6}" ` - if [ $? = 1 ] ; then + if [ $? = 1 ] ; then echo "1" > "${HOME}/.config/.PortTime" else case $xsd2 in "${port_time4}") xdg-open "$urlg" & - echo "300" > "${HOME}/.config/.PortTime" + echo "300" > "${HOME}/.config/.PortTime" exit 0 ;; "${port_time5}") echo "75" > "${HOME}/.config/.PortTime" ;; "${port_time6}") echo "150" > "${HOME}/.config/.PortTime" ;; - esac + esac fi - fi + fi } PW_INIT_PFX () { @@ -621,10 +614,10 @@ PW_INIT_PFX () { fi create_new_dir "${WINEPREFIX}/drive_c" create_new_dir "${WINEPREFIX}/dosdevices" - [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" - [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" create_new_dir "${WINEPREFIX}/drive_c/windows/syswow64/" create_new_dir "${WINEPREFIX}/drive_c/windows/system32/" + [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" + [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" PW_STOP_PROGRESS_BAR PW_START_PROGRESS_BAR_BLOCK "Updating prefix... Please wait..." KILL_PORTWINE @@ -633,7 +626,9 @@ PW_INIT_PFX () { KILL_PORTWINE PW_STOP_PROGRESS_BAR PW_START_PROGRESS_BAR_CS "Initialization prefix..." - fi + fi + [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" + [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" fi @@ -649,17 +644,20 @@ PW_INIT_PFX () { try_copy_file "${WINEDIR}/share/fonts/"SourceHanSansSCRegular.otf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n" - export TOTAL_VRAM=`"${WINELIB}/runtime/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` + export TOTAL_VRAM=`"${PW_WINELIB}/runtime/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` echo "TOTAL_VRAM=${TOTAL_VRAM}" - try_copy_file "${WINEDIR}/lib/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${WINEDIR}/lib64/wine/dxvk/dxvk_config.dll" "${WINEPREFIX}/drive_c/windows/system32/" - if [ "${PW_VULKAN_USE}" = "0" ]; then + echo "Try copy native DXGI" + if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" + fi + if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" + then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" + fi + if [ "${PW_VULKAN_USE}" = "0" ] ; then export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}" - export GL_NO_DSO_FINALIZER=1 - export GL_YIELD="NOTHING" - export GL_SHARPEN_IGNORE_FILM_GRAIN=0 - export GL_SHARPEN_ENABLE=1 - export __GL_SHARPEN_VALUE=0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export GL_NO_DSO_FINALIZER=1 + export GL_YIELD="NOTHING" for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do if ! try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" then try_copy_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" @@ -668,55 +666,34 @@ PW_INIT_PFX () { then try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi done - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - fi - var_winedlloverride_update "dxgi=b;d3d12=" + var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12=" echo "Use OpenGL" - elif [ "${PW_VULKAN_USE}" = "dxvk" ]; then - for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do - try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + elif [ "${PW_VULKAN_USE}" = "vkd3d" ] ; then + echo "Try copy native VKD3D files" + for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do + try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" + var_winedlloverride_update "${wine_vkd3d_dll}=n" + var_winedlloverride_update="dxgi=b" + done + export VKD3D_FEATURE_LEVEL="12_0" + echo "Use VKD3D-PROTON only (DX12 to vulkan)" + else + export CP_DXVK_FILES="d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi dxvk_config" + echo "Try copy native DXVK files" + for wine_dxvk_dll in ${CP_DXVK_FILES} ; do + try_copy_file "${WINEDIR}/lib/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/dxvk/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update "${wine_dxvk_dll}=n" done - var_winedlloverride_update "d3d12=" - echo "Use DXVK version ${PW_DXVK_VER} (DX9-DX11 to Vulkan)" - else - for wine_vkd3d_dll in d3d12 ; do - try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - var_winedlloverride_update "${wine_vkd3d_dll}=n" + echo "Try copy native VKD3D files" + for wine_vkd3d_dll in d3d12 libvkd3d-proton-utils-3 ; do + try_copy_file "${WINEDIR}/lib/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_copy_file "${WINEDIR}/lib64/wine/vkd3d-proton/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" done - if [ ! -z "${PW_DXGI_FROM_DXVK}" ] && [ "${PW_DXGI_FROM_DXVK}" != 0 ] ; then - for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do - try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - var_winedlloverride_update "${wine_dxvk_dll}=n" - done - else - if ! try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/" - fi - var_winedlloverride_update "dxgi=b" - for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do - if ! try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - then try_copy_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - fi - if ! try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - fi - done - fi - export VKD3D_FEATURE_LEVEL="12_0" - export PW_WINDOWS_VER="10" - echo "Use VKD3D-PROTON version ${PW_VKD3D_VER} (DX12 to vulkan)" + echo "Use DXVK + VKD3D-PROTON" fi + PW_OTHER_FIXES } @@ -821,27 +798,11 @@ fi unset MANGOHUD PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_CHECK_AUTOINSTAL var_winedlloverride_update "winemenubuilder.exe=" -export url_mono="https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${mono_ver}/wine-mono-${mono_ver}-x86.tar.xz" -export url_gecko_x86="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86.tar.xz" -export url_gecko_x86_64="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86_64.tar.xz" export urlg="https://portwine-linux.ru/portwine-faq/" export PW_FTP_URL="https://portwine-linux.ru/ftp" -export WINEDIR="${PORT_WINE_PATH}"/data/dist -export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}" -export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" -export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}" +export PW_WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" -export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan" -export PW_DXVK_VER="${PW_DEF_DXVK_VER}" -export PW_VKD3D_VER="${PW_DEF_VKD3D_VER}" export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1` -if [ ! -z "${PW_FORCE_DISABLED_RUNTIME}" ] && [ "${PW_FORCE_DISABLED_RUNTIME}" != 0 ] ; then - export PW_RUNTIME="" - echo "RUNTIME is disabled" -else - export PW_RUNTIME="${WINELIB}/run-in-soldier --remove-game-overlay --share-home --filesystem="${PORT_WINE_PATH}" --runtime=runtime --" - echo "RUNTIME is enabled" -fi if [ -z "${INSTALLING_PORT}" ] ; then PW_LOAD_LIBS diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index 945ee30..4f1a8fe 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -6,7 +6,6 @@ try_remove_file "${PORT_WINE_TMP_PATH}/update_notifier" try_remove_file "${PORT_WINE_TMP_PATH}/init_run_suc" try_remove_file "${PORT_WINE_PATH}/data/port_on" -try_remove_file "${PORT_WINE_PATH}/data/dxvk.conf" try_remove_file "${PORT_WINE_PATH}/settings.desktop" try_remove_file "${PORT_WINE_PATH}/debug.desktop" try_remove_file "${PORT_WINE_PATH}/restart.desktop" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 7803866..7758ffe 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -30,7 +30,11 @@ PORTWINE_CREATE_SHORTCUT () { --title="${sc_path}" --filename="${PORT_WINE_PATH}/data/pfx/drive_c/") if [ $? -eq 1 ];then exit 1; fi fi - PORTPROTON_NAME="$(basename "${PORTPROTON_EXE}" | sed s/".exe"/""/gi )" + if [ ! -z "${PORTWINE_CREATE_SHORTCUT_NAME}" ] ; then + export PORTPROTON_NAME="${PORTWINE_CREATE_SHORTCUT_NAME}" + else + PORTPROTON_NAME="$(basename "${PORTPROTON_EXE}" | sed s/".exe"/""/gi )" + fi PORTPROTON_PATH="$( cd "$( dirname "${PORTPROTON_EXE}" )" >/dev/null 2>&1 && pwd )" if [ -x "`which wrestool 2>/dev/null`" ]; then wrestool -x --output="${PORTPROTON_PATH}/" -t14 "${PORTPROTON_EXE}" @@ -80,13 +84,21 @@ PORTWINE_DEBUG () { KILL_PORTWINE export PW_LOG=1 export PW_WINEDBG_DISABLE=0 - START_PORTWINE echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log" echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log" - echo "-----------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "-------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "PortWINE version:" >> "${PORT_WINE_PATH}/${portname}.log" read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver" echo "${portname}-${install_ver}" >> "${PORT_WINE_PATH}/${portname}.log" + echo "------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Scripts version:" >> "${PORT_WINE_PATH}/${portname}.log" + cat "${PORT_WINE_TMP_PATH}/scripts_ver" >> "${PORT_WINE_PATH}/${portname}.log" + echo "-----------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" + if [ ! -z "${PW_FORCE_DISABLED_RUNTIME}" ] && [ "${PW_FORCE_DISABLED_RUNTIME}" != 0 ] ; then + echo "RUNTIME is disabled" >> "${PORT_WINE_PATH}/${portname}.log" + else + echo "RUNTIME is enabled" >> "${PORT_WINE_PATH}/${portname}.log" + fi echo "----------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" if [ ! -z "${portwine_exe}" ] ; then echo "Debug for programm:" >> "${PORT_WINE_PATH}/${portname}.log" @@ -124,11 +136,11 @@ PORTWINE_DEBUG () { free -m >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Graphic cards and drivers" >> "${PORT_WINE_PATH}/${portname}.log" - "${WINELIB}/runtime/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" + "${PW_WINELIB}/runtime/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" - "${WINELIB}/runtime/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" - "${WINELIB}/runtime/bin/vkcube" --c 50 + "${PW_WINELIB}/runtime/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" + "${PW_WINELIB}/runtime/bin/vkcube" --c 50 if [ $? -eq 0 ]; then echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" else @@ -141,7 +153,10 @@ PORTWINE_DEBUG () { fi echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log" - ${PW_RUNTIME} "$WINELOADER" --version 2>&1 | tee -a "${PORT_WINE_PATH}/${portname}.log" + if [ -f "${WINEDIR}/version" ] + then cat "${WINEDIR}/version" >> "${PORT_WINE_PATH}/${portname}.log" + else ${PW_RUNTIME} "$WINELOADER" --version 2>&1 | tee -a "${PORT_WINE_PATH}/${portname}.log" + fi echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log" cat "${WINEPREFIX}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 9007e65..3be8539 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -6,12 +6,9 @@ #export DXVK_HUD=fps,devinfo #export PW_VIRTUAL_DESKTOP=1 -export PW_FORCE_DISABLED_RUNTIME=1 +#export PW_FORCE_DISABLED_RUNTIME=1 #export PW_FORCE_DISABLED_GAMEMOD=1 -export PW_DEF_DXVK_VER=1.8.1 -export PW_DEF_VKD3D_VER=2.3.1 - export PW_FORCE_USE_VSYNC=2 export PW_LOG=0 export PW_TERM="" @@ -19,14 +16,15 @@ export PW_USE_TERMINAL=0 export PW_WINEDBG_DISABLE=1 -export PW_WINDOWS_VER="7" +export PW_WINDOWS_VER="10" export WINEARCH="win64" export mono_ver=6.1.2 export gecko_ver=2.47.2 export pw_libs_ver="_v14" -export PW_FORCE_LARGE_ADDRESS_AWARE=1 +export WINEDIR="${PORT_WINE_PATH}/data/dist" +export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export porturl="http://portwine-linux.ru/" ########################################################################