diff --git a/polymer/eduke32/build/include/renderlayer.h b/polymer/eduke32/build/include/renderlayer.h
index 6902b7189..ddba9e21b 100644
--- a/polymer/eduke32/build/include/renderlayer.h
+++ b/polymer/eduke32/build/include/renderlayer.h
@@ -4,3 +4,8 @@
 #else
 # include "sdlayer.h"
 #endif
+
+#undef STARTUP_SETUP_WINDOW
+#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2))
+# define STARTUP_SETUP_WINDOW
+#endif
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index 73d34554e..31cc90c82 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -494,11 +494,6 @@ void M32_DrawRoomsAndMasks(void)
     }
 }
 
-#undef STARTUP_SETUP_WINDOW
-#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
-# define STARTUP_SETUP_WINDOW
-#endif
-
 int32_t app_main(int32_t argc, const char **argv)
 {
 #ifdef STARTUP_SETUP_WINDOW
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index c6c4ff890..d0c3a86bb 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -169,6 +169,8 @@ int32_t wm_msgbox(char *name, char *fmt, ...)
     return osx_msgbox(name, buf);
 #elif defined HAVE_GTK2
     if (gtkbuild_msgbox(name, buf) >= 0) return 1;
+#elif SDL_MAJOR_VERSION==2
+    return SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, name, buf, NULL);
 #endif
     puts(buf);
     puts("   (press Return or Enter to continue)");
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 8f1bba9ae..022dd3ef3 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9036,7 +9036,7 @@ static void G_ShowParameterHelp(void)
 //              "\n-?/--help\tDisplay this help message and exit\n"
               "\nSee eduke32 -debughelp for debug parameters"
               ;
-#if defined RENDERTYPEWIN
+#if defined STARTUP_SETUP_WINDOW
     Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
     wm_msgbox(tempbuf,"%s",s);
 #else
@@ -9069,7 +9069,7 @@ static void G_ShowDebugHelp(void)
               "  diag, nojit, traces, dump, strict\n"
 #endif
               ;
-#if defined RENDERTYPEWIN
+#if defined STARTUP_SETUP_WINDOW
     Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
     wm_msgbox(tempbuf,"%s",s);
 #else