forked from CastroFidel/PortWINE
		
	Merge branch 'galium-flatpak' of https://github.com/Boria138/PortWINE into Boria138-galium-flatpak
This commit is contained in:
		| @@ -1901,6 +1901,9 @@ d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d vulkan-1 shell32" | |||||||
|         var_winedlloverride_update "d3d9=n;wined3d=b;dxvk_config,vulkan-1,winevulkan=" |         var_winedlloverride_update "d3d9=n;wined3d=b;dxvk_config,vulkan-1,winevulkan=" | ||||||
|         unset FIND_D3D_MODULE D3D_MODULE_PATH |         unset FIND_D3D_MODULE D3D_MODULE_PATH | ||||||
|         FIND_D3D_MODULE=`dirname $(find /usr/ -maxdepth 4 -type f -name "d3dadapter9.so.*") 2>/dev/null` |         FIND_D3D_MODULE=`dirname $(find /usr/ -maxdepth 4 -type f -name "d3dadapter9.so.*") 2>/dev/null` | ||||||
|  |         FLATPAK_D3D_MODULES_PATH="/app/lib/i386-linux-gnu/GL/default/lib/d3d | ||||||
|  |                                   /usr/lib/x86_64-linux-gnu/GL/default/lib/d3d" | ||||||
|  |         if ! check_flatpak ; then | ||||||
|             if [[ ! -z "$FIND_D3D_MODULE" ]] ; then |             if [[ ! -z "$FIND_D3D_MODULE" ]] ; then | ||||||
|                 old_IFS=$IFS |                 old_IFS=$IFS | ||||||
|                 IFS=$'\n' |                 IFS=$'\n' | ||||||
| @@ -1917,6 +1920,15 @@ d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d vulkan-1 shell32" | |||||||
|                 yad_error "d3dadapter9.so.1.0.0 - ${loc_find_d3dadapter9_error}" |                 yad_error "d3dadapter9.so.1.0.0 - ${loc_find_d3dadapter9_error}" | ||||||
|                 stop_portwine |                 stop_portwine | ||||||
|             fi |             fi | ||||||
|  |         else | ||||||
|  |             for D3D_MP in $FLATPAK_D3D_MODULES_PATH ; do | ||||||
|  |                 if [[ ! -z "$D3D_MODULE_PATH" ]] | ||||||
|  |                 then export D3D_MODULE_PATH="$D3D_MODULE_PATH:/run/parent${D3D_MP}" | ||||||
|  |                 else export D3D_MODULE_PATH="/run/parent${D3D_MP}" | ||||||
|  |                 fi | ||||||
|  |             done | ||||||
|  |             print_info "D3D_MODULE_PATH=${D3D_MODULE_PATH}" | ||||||
|  |         fi | ||||||
|         export mesa_glthread=true |         export mesa_glthread=true | ||||||
|         export ENABLE_VKBASALT=0 |         export ENABLE_VKBASALT=0 | ||||||
|         export PW_MANGOHUD=0 |         export PW_MANGOHUD=0 | ||||||
|   | |||||||
| @@ -285,7 +285,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then | |||||||
| 	export PW_PFX_BACKUP_SUCCESS="Успешно создана резервная копия префикса:" | 	export PW_PFX_BACKUP_SUCCESS="Успешно создана резервная копия префикса:" | ||||||
| 	export PW_PFX_BACKUP_ERROR="Произошла ошибка во время создания резервной копии префикса:" | 	export PW_PFX_BACKUP_ERROR="Произошла ошибка во время создания резервной копии префикса:" | ||||||
|  |  | ||||||
| 	export loc_find_d3dadapter9_error="не найден в системе.\nУстановите недостающий пакет: </Sb>d3dadapter9</b>" | 	export loc_find_d3dadapter9_error="Не найден в системе.\nУстановите недостающий пакет: d3dadapter9" | ||||||
|  |  | ||||||
| 	export loc_gui_create_shortcut_for_exe="Выберите .exe файл для которого необходимо создать ярлык и нажмите ОК.\n" | 	export loc_gui_create_shortcut_for_exe="Выберите .exe файл для которого необходимо создать ярлык и нажмите ОК.\n" | ||||||
|  |  | ||||||
| @@ -700,7 +700,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then | |||||||
| 	export PW_PFX_BACKUP_SUCCESS="Backup has been successfully created for prefix:" | 	export PW_PFX_BACKUP_SUCCESS="Backup has been successfully created for prefix:" | ||||||
| 	export PW_PFX_BACKUP_ERROR="An error occurred while backing up the prefix:" | 	export PW_PFX_BACKUP_ERROR="An error occurred while backing up the prefix:" | ||||||
|  |  | ||||||
| 	export loc_find_d3dadapter9_error="Not found in the system.\nInstall the missing package: </Sb>d3dadapter9</b>" | 	export loc_find_d3dadapter9_error="Not found in the system.\nInstall the missing package: d3dadapter9" | ||||||
|  |  | ||||||
| 	export loc_gui_create_shortcut_for_exe="Choose the .exe file for which you need to create a shortcut and click OK.\n" | 	export loc_gui_create_shortcut_for_exe="Choose the .exe file for which you need to create a shortcut and click OK.\n" | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user