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

GUI: Add GUI option for Discord RPC integration #3334

Merged
merged 3 commits into from Sep 2, 2021

Conversation

@lotharsm
Copy link
Member

@lotharsm lotharsm commented Aug 31, 2021

Currently, the Discord RPC integration is always active as long as Discord integration is built-in and USE_DISCORD is defined.

This patch adds an GUI option, allowing to either enable or disable the Discord RPC integration as requested.

@bluegr
Copy link
Member

@bluegr bluegr commented Sep 1, 2021

Looks good to me, thanks!

@lotharsm
Copy link
Member Author

@lotharsm lotharsm commented Sep 2, 2021

Thank you, merging then 👍

@lotharsm lotharsm merged commit 7b0ce62 into scummvm:master Sep 2, 2021
7 checks passed
7 checks passed
@github-actions
Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --enable-discord, curl discord-rpc...
Details
@github-actions
Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --enable-discord, curl discord-rpc f...
Details
@github-actions
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --enable-discord --disable-fri...
Details
@github-actions
Xcode (macosx, -scheme ScummVM-macOS, --disable-nasm --enable-faad --enable-mpeg2, a52dec faad2 f...
Details
@github-actions
Xcode (ios7, -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO, --disable-nasm --...
Details
@github-actions
Ubuntu (ubuntu-latest, sdl2-config, --enable-c++11, libsdl2-dev libsdl2-net-dev liba52-dev libjpe...
Details
@github-actions
Ubuntu (ubuntu-18.04, sdl-config, --disable-c++11, libsdl1.2-dev libsdl-net1.2-dev liba52-dev lib...
Details
@lotharsm lotharsm deleted the lotharsm:discord-gui-option branch Sep 2, 2021
@lotharsm
Copy link
Member Author

@lotharsm lotharsm commented Sep 2, 2021

Oh, I wonder if we should backport this to branch-2-3 as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants