Merge branch 'macos-mojave-fixes'

CMakeLists.txt

@@ -6,7 +6,7 @@ conan_basic_setup()
 
 ## Setup options ##
 
-option(STEAM "Build for Steam" OFF)
+option(STEAM "Build for Steam" ON)
 
 ## Misc setup ##
 

make-oneshot-mac.command

@@ -15,9 +15,13 @@ cyan="\033[1;36m"       # Cyan - Bold
 green="\033[1;32m"      # Green - Bold
 color_reset="\033[0m"   # Reset Colors
 
+use_qmake=True
+
 echo "${white}Compiling ${bold}SyngleChance v${mac_version} ${white}engine for macOS...${color_reset}\n"
 
 # Generate makefile and build main + journal
+if [[ $use_qmake == True ]]
+	then
 	echo "-> ${cyan}Generate makefile...${color_reset}"
 	qmake MRIVERSION=2.5
 	echo "-> ${cyan}Compile engine...${color_reset}"
@@ -26,6 +30,9 @@ echo "-> ${cyan}Compile steamshim...${color_reset}"
 	cd steamshim_parent
 	HOST=osx make -j${make_threads}
 	cd ..
+else
+	echo "${bold}WARNING: Conan/CMake method not ready yet.${color_reset}"
+fi
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 

src/oneshot.cpp

@@ -31,6 +31,7 @@
 
 	#ifdef __APPLE__
 		#define OS_OSX
+		#include <dispatch/dispatch.h>
 	#else
 		#define OS_LINUX
 		#include <gtk/gtk.h>
@@ -557,7 +558,19 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
 	PlaySoundW((LPCWSTR)sound, NULL, SND_ALIAS_ID | SND_ASYNC);
 #endif
 	int button;
+
+	#ifdef OS_OSX
+		int *btn = &button;
+
+		// Message boxes and UI changes must be performed from the main thread on macOS Mojave and above.
+		// This block ensures the message box will show from the main thread.
+		dispatch_sync(dispatch_get_main_queue(),
+			^{ SDL_ShowMessageBox(&data, btn); }
+		);
+	#else
 		SDL_ShowMessageBox(&data, &button);
+	#endif
+
 	return button ? true : false;
 }