forked from CastroFidel/PortWINE
		
	Two vesrion wine in portproton
This commit is contained in:
		| @@ -88,14 +88,13 @@ def getmtimestr(*path_fragments): | ||||
| class Proton: | ||||
|     def __init__(self, base_dir): | ||||
|         self.base_dir = os.environ["PW_COMPAT_DATA_PATH"] | ||||
|         self.dist_dir = self.path("dist/") | ||||
|         self.bin_dir = self.path("dist/bin/") | ||||
|         self.lib_dir = self.path("dist/lib/") | ||||
|         self.lib64_dir = self.path("dist/lib64/") | ||||
|         self.fonts_dir = self.path("dist/share/fonts/") | ||||
|         self.version_file = self.path("version") | ||||
|         self.wine_bin = self.bin_dir + "wine" | ||||
|         self.wineserver_bin = self.bin_dir + "wineserver" | ||||
|         self.dist_dir = os.environ["WINEDIR"] | ||||
|         self.bin_dir = self.dist_dir + "/bin/" | ||||
|         self.lib_dir = self.dist_dir + "/lib/" | ||||
|         self.lib64_dir = self.dist_dir + "/lib64/" | ||||
|         self.fonts_dir = self.dist_dir + "/share/fonts/" | ||||
|         self.wine_bin = self.bin_dir + "/wine" | ||||
|         self.wineserver_bin = self.bin_dir + "/wineserver" | ||||
|         self.gamemoderun = "gamemoderun" | ||||
|  | ||||
|     def path(self, d): | ||||
| @@ -105,7 +104,6 @@ class CompatData: | ||||
|     def __init__(self, compatdata): | ||||
|         self.base_dir = os.environ["PW_COMPAT_DATA_PATH"] | ||||
|         self.prefix_dir = self.path("pfx/") | ||||
|         self.version_file = self.path("version") | ||||
|  | ||||
|     def path(self, d): | ||||
|         return self.base_dir + d | ||||
|   | ||||
| @@ -39,14 +39,7 @@ echo "RAM" >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| free -m >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| echo "Graphic cards and drivers" >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| lspci | grep VGA >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| lspci | grep 3D >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| if [ -x "`which glxinfo 2>/dev/null`" ] | ||||
| then | ||||
| 	glxinfo | grep OpenGL >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| else | ||||
| 	echo "!!!glxinfo not found!!!"  >> "${PORT_WINE_PATH}/${portname}.log" | ||||
| fi | ||||
| "${WINELIB}/amd64/usr/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}/amd64/usr/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" | ||||
|   | ||||
| @@ -156,21 +156,35 @@ fi | ||||
| export DXVK_HUD="${var_dxvk_on}" | ||||
| echo "DXVK_HUD=${DXVK_HUD}" | ||||
|  | ||||
| cp -f "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEDIR}/lib/wine/dxgi.dll" | ||||
| cp -f "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEDIR}/lib64/wine/dxgi.dll" | ||||
|  | ||||
| if [ "${var_dxvk_on}" != "off" ]; then | ||||
|     export PW_USE_WINED3D=0 | ||||
|     export PW_DXGI_FROM_DXVK=1 | ||||
|     if [ -d "${WINEDIR}_dxvk" ]; then | ||||
|         export WINEDIR="${WINEDIR}_dxvk" | ||||
|         export WINELOADER="${WINEDIR}/bin/wine" | ||||
|         export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" | ||||
|         export WINESERVER="${WINEDIR}/bin/wineserver" | ||||
|         export PATH="${WINEDIR}/bin:${PATH}" | ||||
|     fi | ||||
|     echo "Use DXVK and D9VK (DX9-DX11 to Vulkan)" | ||||
|  | ||||
| else | ||||
|     export PW_USE_WINED3D=1 | ||||
|     export PW_VKD3D_FEATURE_LEVEL=1 | ||||
|     export VKD3D_CONFIG=force_bindless_texel_buffer | ||||
|     if [ -d "${WINEDIR}_vkd3d" ]; then | ||||
|         export WINEDIR="${WINEDIR}_vkd3d" | ||||
|         export WINELOADER="${WINEDIR}/bin/wine" | ||||
|         export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine" | ||||
|         export WINESERVER="${WINEDIR}/bin/wineserver" | ||||
|         export PATH="${WINEDIR}/bin:${PATH}" | ||||
|     fi | ||||
|     echo "Use OpenGL and VKD3D (DX9-DX11 to OpenGL and DX12 to vulkan)" | ||||
| fi | ||||
|  | ||||
| cp -f "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEDIR}"/lib/wine/dxgi.dll | ||||
| cp -f "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEDIR}"/lib64/wine/dxgi.dll | ||||
|  | ||||
| export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}" | ||||
| export DXVK_STATE_CACHE=1 | ||||
| export STAGING_SHARED_MEMORY=1 | ||||
| @@ -238,11 +252,11 @@ else | ||||
| fi | ||||
| echo "######################################################" | ||||
| ######################################################################## | ||||
| sed -i '/HKCU,Software\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf" && | ||||
| sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf" && | ||||
| sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}/share/wine/wine.inf" && | ||||
| sed -i '/HKCR,steam\\shell\\open\\command/d' "${WINEDIR}/share/wine/wine.inf" && | ||||
| rm -f  "${WINEDIR}"/lib*/wine/*steam* | ||||
| sed -i '/HKCU,Software\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf && | ||||
| sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf && | ||||
| sed -i '/HKLM,Software\\Wow6432Node\\Valve\\Steam/d' "${WINEDIR}"*/share/wine/wine.inf && | ||||
| sed -i '/HKCR,steam\\shell\\open\\command/d' "${WINEDIR}"*/share/wine/wine.inf && | ||||
| rm -f  "${WINEDIR}"*/lib*/wine/*steam* | ||||
| if [ ! -d "${WINEPREFIX}" ] || [ ! -d "${WINEPREFIX}"/dosdevices ] || [ ! -d "${WINEPREFIX}"/drive_c/windows ] || [ ! -f "${WINEPREFIX}"/system.reg ] || [ ! -f "${WINEPREFIX}"/user.reg ] || [ ! -f "${WINEPREFIX}"/userdef.reg ]; then | ||||
|     $PW_TERM "${PW_RUNTIME}"  "${WINELOADER}" wineboot -u | ||||
| fi | ||||
|   | ||||
| @@ -25,6 +25,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=0 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -25,6 +25,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -25,6 +25,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| GalaxyCommunication ()  | ||||
| { | ||||
|   | ||||
| @@ -24,6 +24,7 @@ export PW_NVAPI_DISABLE=1 | ||||
| export PW_NO_WRITE_WATCH=1 | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| export PW_FORCE_LARGE_ADDRESS_AWARE=0 | ||||
| #export MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -22,6 +22,7 @@ export PW_NVAPI_DISABLE=1 | ||||
| export PW_NO_WRITE_WATCH=1 | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| export PW_FORCE_LARGE_ADDRESS_AWARE=1 | ||||
| #export MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -27,6 +27,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -25,6 +25,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
| @@ -25,6 +25,7 @@ export PW_FORCE_USE_VSYNC=2         # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAU | ||||
| export PW_WINEDBG_DISABLE=1 | ||||
| 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 MANGOHUD=1 | ||||
| ######################################################################## | ||||
| ADD_IN_START_PORTWINE () | ||||
| { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user