mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-11-15 22:19:07 +00:00
Fix build + use win32 message boxes if on windows (they are nicer for dealing with Lua errors)
This commit is contained in:
parent
906563c957
commit
6d4b9502cb
1 changed files with 4 additions and 6 deletions
|
@ -813,12 +813,11 @@ void cocoaMessageBox(const std::string &title, const std::string &msg);
|
||||||
|
|
||||||
void messageBox(const std::string& title, const std::string &msg)
|
void messageBox(const std::string& title, const std::string &msg)
|
||||||
{
|
{
|
||||||
#if SDL_VERSION_ATLEAST(2,0,0)
|
|
||||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, title.c_str(),
|
|
||||||
msg.c_str, NULL);
|
|
||||||
#else
|
|
||||||
#ifdef BBGE_BUILD_WINDOWS
|
#ifdef BBGE_BUILD_WINDOWS
|
||||||
MessageBox (0,msg.c_str(),title.c_str(),MB_OK);
|
MessageBox (0,msg.c_str(),title.c_str(),MB_OK);
|
||||||
|
#elif SDL_VERSION_ATLEAST(2,0,0)
|
||||||
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, title.c_str(),
|
||||||
|
msg.c_str(), NULL);
|
||||||
#elif defined(BBGE_BUILD_MACOSX)
|
#elif defined(BBGE_BUILD_MACOSX)
|
||||||
cocoaMessageBox(title, msg);
|
cocoaMessageBox(title, msg);
|
||||||
#elif defined(BBGE_BUILD_UNIX)
|
#elif defined(BBGE_BUILD_UNIX)
|
||||||
|
@ -827,7 +826,6 @@ void messageBox(const std::string& title, const std::string &msg)
|
||||||
#else
|
#else
|
||||||
#error Please define your platform.
|
#error Please define your platform.
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector getNearestPointOnLine(Vector a, Vector b, Vector c)
|
Vector getNearestPointOnLine(Vector a, Vector b, Vector c)
|
||||||
|
|
Loading…
Reference in a new issue