search

NyanCatTW1 / robloxWineBuildGuide

A hopefully complete guide on how to build latest Wine using wine-tkg-git, with the goal of playing Roblox on Linux without hassle.
MIT License
32 stars 4 forks source link

Error while compiling #22

Closed ioletsgo closed 2 years ago

ioletsgo commented 2 years ago 
�[1m�[34m  ->�(B�[m�[1m Cleaning wine-staging source code tree...�(B�[m
HEAD is now at c9652a68 Rebase against 29dd84443976005a8ec713dd1c75458e27346591.
�[1m�[34m  ->�(B�[m�[1m Cleaning wine source code tree...�(B�[m
HEAD is now at 29dd8444397 dbghelp: Use remap table from PDB hash stream.

af8ed02b572081206be6c505261f5f2e98a8053c reverted (hotfix)

313f75a0afc108db904aae4885da1f3783cd34c5 reverted (hotfix)
Auto-merging dlls/user32/menu.c
CONFLICT (content): Merge conflict in dlls/user32/menu.c
Auto-merging dlls/win32u/menu.c
CONFLICT (content): Merge conflict in dlls/win32u/menu.c
Auto-merging include/ntuser.h