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.

Sign up for GitHub

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

Jump to bottom

Implement GLFW/OpenAL override by defining and auto-detecting paths to library files #1392

Merged
merged 7 commits into from Aug 17, 2023
Merged

Implement GLFW/OpenAL override by defining and auto-detecting paths to library files #1392

merged 7 commits into from Aug 17, 2023

Conversation

Scrumplex
Copy link
Member

Closes #513

@Scrumplex Scrumplex added the enhancement New feature or request label Jul 17, 2023
@Scrumplex Scrumplex added this to the 8.0 milestone Jul 17, 2023
@TheKodeToad TheKodeToad added the changelog:fixed A PR that appears under "Fixed" in the changelog label Jul 30, 2023
@Scrumplex Scrumplex changed the title Implement override for GLFW/OpenAL with split natives Implement GLFW/OpenAL override by defining and auto-detecting paths to library files. Aug 2, 2023
@Scrumplex Scrumplex changed the title Implement GLFW/OpenAL override by defining and auto-detecting paths to library files. Implement GLFW/OpenAL override by defining and auto-detecting paths to library files Aug 2, 2023
@Scrumplex Scrumplex added changelog:changed A PR that appears under "Changed" in the changelog and removed changelog:fixed A PR that appears under "Fixed" in the changelog labels Aug 2, 2023
@Scrumplex
Copy link
Member Author

I have updated this PR. The mechanism I added initially is now used to figure out a default value for the new path settings. This way users on other platforms can continue using this feature but now with the added benefit of having a more precise control of its behavior.

@orowith2os
Copy link
Contributor

Will test and provide some quick feedback for Linux shortly.

orowith2os
orowith2os approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@orowith2os orowith2os left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any concerns I might have have been addressed, it all works fine here on the Flatpak, and it feels nice being able to play Minecraft natively on Wayland with ease now. Thanks!

@Scrumplex Scrumplex force-pushed the feat-native-override branch 2 times, most recently from 4bc8101 to 6af4055 Compare August 4, 2023 18:16
getchoo
getchoo approved these changes Aug 6, 2023
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

TheKodeToad
TheKodeToad approved these changes Aug 6, 2023
View reviewed changes
launcher/MangoHud.cpp Show resolved Hide resolved
@Scrumplex
Copy link
Member Author

reminder not to merge before staging is done

@Scrumplex
feat: implement override for GLFW/OpenAL with split natives
ff67fd1 
Fixes PrismLauncher#513

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
feat: add custom native library path settings
83aa006 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
fix: remove meta OpenAL workaround
4c446cc 
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason
for this code.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
fix: fix typo
f1c3da6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
fix: improve debug message
b927e58 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
fix: only add native library overrides if files exist
c2d6a13 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
fix: add missing header
06aba53 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
Copy link
Member Author

rebased to develop

@Scrumplex
Copy link
Member Author

Could someone test this feature on Windows? Obviously, auto-detection of libraries is not implemented there.

@Scrumplex Scrumplex added the needs-testing PRs that should be tested a bit more before being merged label Aug 15, 2023
@Scrumplex Scrumplex merged commit e88418a into PrismLauncher:develop Aug 17, 2023
23 of 27 checks passed
@Scrumplex Scrumplex deleted the feat-native-override branch August 17, 2023 14:09
@Scrumplex Scrumplex removed the needs-testing PRs that should be tested a bit more before being merged label Aug 17, 2023
@Scrumplex Scrumplex mentioned this pull request Nov 18, 2023
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ryex Ryex Ryex left review comments

@TheKodeToad TheKodeToad TheKodeToad approved these changes

@orowith2os orowith2os orowith2os approved these changes

@getchoo getchoo getchoo approved these changes

Assignees
No one assigned
Labels
changelog:changed A PR that appears under "Changed" in the changelog enhancement New feature or request
Projects
None yet
Milestone
8.0
Development

Successfully merging this pull request may close these issues.

System installation overrides don't work for Mojang's split natives
5 participants
@Scrumplex @orowith2os @Ryex @getchoo @TheKodeToad