snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 21:39:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into linux

Browse source
This commit is contained in:
Vinyl Darkscratch 2018-10-05 18:27:49 -07:00
commit 97b3bf4a46
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

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

23
make-oneshot-mac.command
View file

@ -15,17 +15,24 @@ 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
echo "-> ${cyan}Generate makefile...${color_reset}"
qmake MRIVERSION=2.5
echo "-> ${cyan}Compile engine...${color_reset}"
make -j${make_threads}
echo "-> ${cyan}Compile steamshim...${color_reset}"
cd steamshim_parent
HOST=osx make -j${make_threads}
cd ..
if [[ $use_qmake == True ]]
then
echo "-> ${cyan}Generate makefile...${color_reset}"
qmake MRIVERSION=2.5
echo "-> ${cyan}Compile engine...${color_reset}"
make -j${make_threads}
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

17
src/oneshot.cpp
View file

@ -31,6 +31,7 @@
#ifdef __APPLE__
#define OS_OSX
#include <dispatch/dispatch.h>
#else
#define OS_LINUX
#include <gtk/gtk.h>
@ -503,7 +504,7 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
// Messagebox data
SDL_MessageBoxData data;
data.window = NULL;//p->window;
data.window = NULL; //p->window;
data.colorScheme = 0;
data.title = title;
data.message = body;
@ -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;
SDL_ShowMessageBox(&data, &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;
}