Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat/macOS] Add Wine and DXVK support for macOS #2108

Merged
merged 33 commits into from
Dec 6, 2022
Merged

Conversation

flavioislima
Copy link
Member

@flavioislima flavioislima commented Nov 30, 2022

This PR adds Wine and Wineskin support to macOS.
Although, packaged applications cannot access system wine so versions like Wine-Crossover should be installed on the user applications folder so we know in case someone asks why it is not being detected. So if it is installed using BREW it needs to be moved to the user Applications folder.

Wineskin doesn't matter since Heroic will use the Wrapper inside ~/Applications/Wineskin.
Not sure if we should support the whole wrapper/prefix/bottle for WineSkin, will need to check the effort for that.

Besides that, DXVK toggle is now enabled for Wine version type on Mac and feedback was added to when it is being installed because, so the settings will be disabled and the text will change.

Ofc the DXVK methods to get latest version and install were also changed since they differ from the Linux version.

image

image


Use the following Checklist if you have changed something on the Backend or Frontend:

  • Tested the feature and it's working on a current and clean install.
  • Tested the main App features and they are still working on a current and clean install. (Login, Install, Play, Uninstall, Move games, etc.)
  • Created / Updated Tests (If necessary)
  • Created / Updated documentation (If necessary)

@flavioislima flavioislima added pr:wip WIP, don't merge. pr:testing This PR is in testing, don't merge. labels Dec 1, 2022
@flavioislima flavioislima marked this pull request as ready for review December 1, 2022 14:30
@flavioislima flavioislima added pr:ready-for-review Feature-complete, ready for the grind! :P and removed pr:wip WIP, don't merge. pr:testing This PR is in testing, don't merge. labels Dec 1, 2022
@flavioislima
Copy link
Member Author

@Heroic-Games-Launcher/development
Refactored how we install DXVK/VKD3D to not rely on the install script anymore since it will be removed. So if you guys cannot test it on a mac there is no problem, just check if the method is properly working on linux and the logic I added to get the Wine versions. 👍🏽

src/backend/config.ts Outdated Show resolved Hide resolved
src/backend/config.ts Show resolved Hide resolved
src/backend/config.ts Outdated Show resolved Hide resolved
src/backend/main.ts Outdated Show resolved Hide resolved
src/backend/sideload/games.ts Outdated Show resolved Hide resolved
src/backend/tools.ts Outdated Show resolved Hide resolved
src/frontend/screens/Game/GamePage/index.tsx Outdated Show resolved Hide resolved
src/frontend/components/UI/ToggleSwitch/index.tsx Outdated Show resolved Hide resolved
src/frontend/screens/Settings/components/AutoDXVK.tsx Outdated Show resolved Hide resolved
src/backend/tools.ts Outdated Show resolved Hide resolved
@flavioislima flavioislima merged commit 8795a06 into main Dec 6, 2022
@flavioislima flavioislima deleted the feat/wine_macos branch December 6, 2022 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:ready-for-review Feature-complete, ready for the grind! :P
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[macOS] Add support for Wineskin and Wine-crossover as well as macOS DXVK installation
2 participants