Skip to content

MacOS Discord Integration Crash Fix #799

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

Open
Ericzklm wants to merge 4 commits into
base: main
Choose a base branch
from
Open

MacOS Discord Integration Crash Fix #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28aa1d3
Added locale info into info.plist
Ericzklm Nov 5, 2025
a13420b
Merge branch 'PokemonAutomation:main' into dpp-mac-crash-fix
Ericzklm Nov 5, 2025
34b215f
Removed shorten-64-to-32 warning on x86 Mac
Ericzklm Nov 5, 2025
e888483
Removed unused parameter error for x86 Mac
Ericzklm Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion SerialPrograms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,12 @@ else() # macOS and Linux
endif()

if (APPLE)
target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
else()
target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter)
endif()

# on macOS, need this framework to query OS API to control display sleep and system sleep behavior
target_link_libraries(SerialProgramsLib PRIVATE "-framework IOKit -framework CoreFoundation")
else() # Linux
Expand Down
7 changes: 7 additions & 0 deletions SerialPrograms/cmake/MacOSXBundleInfo.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSEnvironment</key>
<dict>
<key>LANG</key>
<string>en_US.UTF-8</string>
<key>LC_ALL</key>
<string>en_US.UTF-8</string>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Expand Down