zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

sdlayer.c: fix compiling wm_ynbox() for Linux/WITHOUT_GTK=1.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4476 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-05-18 09:55:43 +00:00
parent e810071cfc
commit 2f6652e59a
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
polymer/eduke32/build/src/sdlayer.c
View file

@ -192,9 +192,6 @@ int32_t wm_ynbox(char *name, char *fmt, ...)
char buf[2048]; char buf[2048];
char c; char c;
va_list va; va_list va;
#if (!defined(__APPLE__) && defined(HAVE_GTK2)) || defined _WIN32
int32_t r = -1;
#endif
UNREFERENCED_PARAMETER(name); UNREFERENCED_PARAMETER(name);
@ -205,17 +202,21 @@ int32_t wm_ynbox(char *name, char *fmt, ...)
#if defined __APPLE__ #if defined __APPLE__
return osx_ynbox(name, buf); return osx_ynbox(name, buf);
#elif defined HAVE_GTK2 #elif defined HAVE_GTK2
if ((r = gtkbuild_ynbox(name, buf)) >= 0) return r; {
int32_t r = gtkbuild_ynbox(name, buf);
if (r >= 0)
return r;
}
#elif defined _WIN32 #elif defined _WIN32
r = MessageBox(win_gethwnd(),buf,name,MB_YESNO|MB_ICONQUESTION|MB_TASKMODAL); return (MessageBox(win_gethwnd(),buf,name,MB_YESNO|MB_ICONQUESTION|MB_TASKMODAL) == IDYES);
if (r==IDYES) return 1;
return 0;
#elif defined __ANDROID__ #elif defined __ANDROID__
initprintf("wm_ynbox called, this is bad! Message: %s: %s",name,buf); initprintf("wm_ynbox called, this is bad! Message: %s: %s",name,buf);
initprintf("Returning false.."); initprintf("Returning false..");
return 0; return 0;
#elif SDL_MAJOR_VERSION==2 #elif SDL_MAJOR_VERSION==2
{ {
int32_t r = -1;
const SDL_MessageBoxButtonData buttons[] = { const SDL_MessageBoxButtonData buttons[] = {
{ {
SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT, SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
@ -243,6 +244,8 @@ int32_t wm_ynbox(char *name, char *fmt, ...)
return r; return r;
} }
#endif #endif
// NOTE: this is dead code for most #ifdef cases above.
puts(buf); puts(buf);
puts(" (type 'Y' or 'N', and press Return or Enter to continue)"); puts(" (type 'Y' or 'N', and press Return or Enter to continue)");
do c = getchar(); while (c != 'Y' && c != 'y' && c != 'N' && c != 'n'); do c = getchar(); while (c != 'Y' && c != 'y' && c != 'N' && c != 'n');