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

Clean up some GUI/WM minutiae. Should fix linking Mapster32 on *nix with HAVE_GTK=0.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4091 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-10-08 10:00:44 +00:00
parent d738fb7ad5
commit 2ab39f2cca
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/include/renderlayer.h
View file

@ -6,6 +6,11 @@
#endif #endif
#undef STARTUP_SETUP_WINDOW #undef STARTUP_SETUP_WINDOW
#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2)) #if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
# define STARTUP_SETUP_WINDOW # define STARTUP_SETUP_WINDOW
#endif #endif
#undef WM_MSGBOX_WINDOW
#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2))
# define WM_MSGBOX_WINDOW
#endif

2
polymer/eduke32/build/src/build.c
View file

@ -544,7 +544,7 @@ int32_t app_main(int32_t argc, const char **argv)
"\t-setup\tDisplays the configuration dialogue box before entering the editor.\n" "\t-setup\tDisplays the configuration dialogue box before entering the editor.\n"
#endif #endif
; ;
#ifdef STARTUP_SETUP_WINDOW #ifdef WM_MSGBOX_WINDOW
wm_msgbox("Mapster32","%s",s); wm_msgbox("Mapster32","%s",s);
#else #else
puts(s); puts(s);

8
polymer/eduke32/source/game.c
View file

@ -9023,7 +9023,7 @@ static void G_ShowParameterHelp(void)
"-r\t\tRecord demo\n" "-r\t\tRecord demo\n"
"-s#\t\tSet skill level (1-4)\n" "-s#\t\tSet skill level (1-4)\n"
"-server\t\tStart a multiplayer game for other players to join\n" "-server\t\tStart a multiplayer game for other players to join\n"
#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)) #ifdef STARTUP_SETUP_WINDOW
"-setup/nosetup\tEnables/disables startup window\n" "-setup/nosetup\tEnables/disables startup window\n"
#endif #endif
"-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n" "-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n"
@ -9036,7 +9036,7 @@ static void G_ShowParameterHelp(void)
// "\n-?/--help\tDisplay this help message and exit\n" // "\n-?/--help\tDisplay this help message and exit\n"
"\nSee eduke32 -debughelp for debug parameters" "\nSee eduke32 -debughelp for debug parameters"
; ;
#if defined STARTUP_SETUP_WINDOW #ifdef WM_MSGBOX_WINDOW
Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev); Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
wm_msgbox(tempbuf,"%s",s); wm_msgbox(tempbuf,"%s",s);
#else #else
@ -9069,7 +9069,7 @@ static void G_ShowDebugHelp(void)
" diag, nojit, traces, dump, strict\n" " diag, nojit, traces, dump, strict\n"
#endif #endif
; ;
#if defined STARTUP_SETUP_WINDOW #ifdef WM_MSGBOX_WINDOW
Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev); Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
wm_msgbox(tempbuf,"%s",s); wm_msgbox(tempbuf,"%s",s);
#else #else
@ -11339,7 +11339,7 @@ int32_t app_main(int32_t argc, const char **argv)
else if (!fg) g_gameNamePtr = "Unknown GRP"; else if (!fg) g_gameNamePtr = "Unknown GRP";
} }
#if (defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))) #ifdef STARTUP_SETUP_WINDOW
if (i < 0 || (!g_noSetup && (ud.configversion != BYTEVERSION_JF || ud.config.ForceSetup)) || g_commandSetup) if (i < 0 || (!g_noSetup && (ud.configversion != BYTEVERSION_JF || ud.config.ForceSetup)) || g_commandSetup)
{ {
if (quitevent || !startwin_run()) if (quitevent || !startwin_run())