From 28aa1d32ad98a39973cc3c111be83a2757632c76 Mon Sep 17 00:00:00 2001
From: Eric Zhang <ericzklm@hotmail.com>
Date: Tue, 4 Nov 2025 21:56:20 -0800
Subject: [PATCH 1/3] Added locale info into info.plist

Added missing locale environment variables for Discord integration
---
 SerialPrograms/cmake/MacOSXBundleInfo.plist.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SerialPrograms/cmake/MacOSXBundleInfo.plist.in b/SerialPrograms/cmake/MacOSXBundleInfo.plist.in
index b23642e29e..3f01fbce4e 100644
--- a/SerialPrograms/cmake/MacOSXBundleInfo.plist.in
+++ b/SerialPrograms/cmake/MacOSXBundleInfo.plist.in
@@ -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>

From 34b215f9db1f3f3c572d45247afd2c5b884fd2a5 Mon Sep 17 00:00:00 2001
From: Eric Zhang <ericzklm@hotmail.com>
Date: Wed, 5 Nov 2025 00:59:32 -0800
Subject: [PATCH 2/3] Removed shorten-64-to-32 warning on x86 Mac

---
 SerialPrograms/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
index 43b59c88b9..8f1ced7b9d 100644
--- a/SerialPrograms/CMakeLists.txt
+++ b/SerialPrograms/CMakeLists.txt
@@ -462,7 +462,11 @@ else() # macOS and Linux
     endif()
 
     if (APPLE)
-        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
+        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror)
+        if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+            target_compile_options(SerialProgramsLib PRIVATE -Wshorten-64-to-32)
+        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

From e88848306176e9acb33584b2339afbe79aaf80db Mon Sep 17 00:00:00 2001
From: Eric Zhang <ericzklm@hotmail.com>
Date: Wed, 5 Nov 2025 20:53:38 -0800
Subject: [PATCH 3/3] Removed unused parameter error for x86 Mac

---
 SerialPrograms/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
index 8f1ced7b9d..84d64c2009 100644
--- a/SerialPrograms/CMakeLists.txt
+++ b/SerialPrograms/CMakeLists.txt
@@ -462,9 +462,10 @@ else() # macOS and Linux
     endif()
 
     if (APPLE)
-        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror)
         if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
-            target_compile_options(SerialProgramsLib PRIVATE -Wshorten-64-to-32)
+            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