Created
August 14, 2022 15:52
-
-
Save niobium93/290b0f6d1675f87cb929dd1806f27e42 to your computer and use it in GitHub Desktop.
Hotfixing fails
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1m[34m ->(B[m[1m Cleaning wine-staging source code tree...(B[m | |
HEAD is now at 552b03f7 Release v7.15 | |
[1m[34m ->(B[m[1m Cleaning wine source code tree...(B[m | |
HEAD is now at a1af412482d Release 7.15. | |
0d4817fadbcdf9b3ee785bcc6239eb4e99db403f reverted (hotfix) | |
Auto-merging dlls/wow64win/user.c | |
Auto-merging dlls/wow64win/wow64win_private.h | |
f79f58cb3a29eb72cdb8decacdf09a960b6e705d reverted (hotfix) | |
7ea592e5fe63bf231f479c184c387ebc64db7151 reverted (hotfix) | |
131de4bb8dd068c0c0c2cca92a953236f93df699 reverted (hotfix) | |
1dfedae9030b18d6648d48fe613a1ade2af382e5 reverted (hotfix) | |
Auto-merging dlls/win32u/message.c | |
Auto-merging dlls/win32u/sysparams.c | |
Auto-merging dlls/win32u/win32u_private.h | |
2c75490c3e6cb8611197fa64c1470a318edb80f0 reverted (hotfix) | |
Auto-merging dlls/win32u/message.c | |
Auto-merging include/ntuser.h | |
CONFLICT (content): Merge conflict in include/ntuser.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
_NUKR="false" | |
_NOINITIALPROMPT="true" | |
_LOCAL_PRESET="none" | |
_use_staging="true" | |
_use_vkd3dlib="false" | |
_proton_fs_hack="true" | |
_FS_bypass_compositor="true" | |
_win10_default="true" | |
_protonify="true" | |
_community_patches="amdags.mypatch ntdll_Map_top-down_if_dll_characteristics_include_DYNAMIC_BASE.mypatch mfplat_nv12_d3d11_buffers.mypatch 0002-proton_LFH.mypatch" | |
_user_patches_no_confirm="true" | |
_hotfixes_no_confirm="true" | |
_GLSL_toggle="true" | |
_GCC_FLAGS="-march=native -O2 -ftree-vectorize" | |
_CROSS_FLAGS="-march=native -O2 -ftree-vectorize" | |
_fsync_futex_waitv="true" | |
_shared_gpu_resources="true" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment