diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 67fab383f..8b3c02395 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -91,7 +91,7 @@ ifneq (0,$(LUNATIC)) endif ifeq ($(PLATFORM),DARWIN) ENGINE_OBJS += osxbits - ifneq (0,$(OSX_STARTUPWINDOW)) + ifeq ($(STARTUP_WINDOW),1) ENGINE_EDITOR_OBJS += startosx.editor endif ifeq ($(SDL_TARGET),1) @@ -315,7 +315,7 @@ ifeq ($(PLATFORM),WINDOWS) endif ifeq ($(PLATFORM),DARWIN) - ifneq (0,$(OSX_STARTUPWINDOW)) + ifeq ($(STARTUP_WINDOW),1) KENBUILD_GAME_OBJS += StartupWinController.game endif endif @@ -499,7 +499,7 @@ ifeq ($(PLATFORM),DARWIN) LIBS += -Wl,-framework,QuickTime -lm endif - ifneq (0,$(OSX_STARTUPWINDOW)) + ifeq ($(STARTUP_WINDOW),1) DUKE3D_GAME_OBJS += GrpFile.game GameListSource.game startosx.game endif endif diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index d7335a60f..d9fd6a505 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -163,8 +163,6 @@ SYNTHESIS ?= 0 # Mac OS X Frameworks location # Like above, use absolute paths. APPLE_FRAMEWORKS ?=/Library/Frameworks -# Without the resource files packaged in the .app bundle, the startupwindow produces errors, so give it an off switch. -OSX_STARTUPWINDOW ?= 1 # Engine options # USE_OPENGL - enables basic OpenGL Polymost renderer @@ -380,9 +378,6 @@ ifeq ($(PLATFORM),DARWIN) COMMONFLAGS += $(F_NO_STACK_PROTECTOR) endif endif - ifneq (0,$(OSX_STARTUPWINDOW)) - COMPILERFLAGS+= -DOSX_STARTUPWINDOW - endif endif diff --git a/polymer/eduke32/build/include/renderlayer.h b/polymer/eduke32/build/include/renderlayer.h index d4471a9a6..0cffe763a 100644 --- a/polymer/eduke32/build/include/renderlayer.h +++ b/polymer/eduke32/build/include/renderlayer.h @@ -8,12 +8,12 @@ #undef STARTUP_SETUP_WINDOW #ifdef STARTUP_WINDOW -#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)) +#if defined _WIN32 || defined EDUKE32_OSX || defined HAVE_GTK2 # define STARTUP_SETUP_WINDOW #endif #undef WM_MSGBOX_WINDOW -#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2)) +#if defined _WIN32 || defined EDUKE32_OSX || defined HAVE_GTK2 || (defined RENDERTYPESDL && SDL_MAJOR_VERSION >= 2) # define WM_MSGBOX_WINDOW #endif #endif \ No newline at end of file diff --git a/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj index 6ba5750f8..ec7c0c95c 100644 --- a/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj +++ b/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj @@ -2331,7 +2331,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2445,7 +2445,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2565,7 +2565,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2679,7 +2679,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2790,7 +2790,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2893,7 +2893,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -2999,7 +2999,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -3099,7 +3099,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -3204,7 +3204,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -3303,7 +3303,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -3441,7 +3441,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", @@ -3541,7 +3541,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-D_THREAD_SAFE", - "-DOSX_STARTUPWINDOW", + "-DSTARTUP_WINDOW", "-DNDEBUG", "-DNO_GCC_BUILTINS", "-D_FORTIFY_SOURCE=2", diff --git a/polymer/eduke32/platform/osxbuild.sh b/polymer/eduke32/platform/osxbuild.sh index 0f26106fc..9169b3f01 100755 --- a/polymer/eduke32/platform/osxbuild.sh +++ b/polymer/eduke32/platform/osxbuild.sh @@ -233,7 +233,7 @@ function dobuildem() # build EDuke32 and Mapster32 } # A little factoring: -commonargs="OSX_STARTUPWINDOW=1 WITHOUT_GTK=1" +commonargs="WITHOUT_GTK=1" if [ $buildppc == 1 ] || [ `expr $darwinversion = 9` == 1 ]; then commonargs="$commonargs DARWIN9=1" fi diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index b8e9baf63..2c1aa7c91 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -8026,7 +8026,7 @@ static void G_ShowParameterHelp(void) #endif "-namesfile [file.h]\t\tLoad a custom NAMES.H for tile names\n" "-nocheck\t\t\tDisables map pointer checking when saving (default)\n" // kept for script compat -#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)) +#ifdef STARTUP_SETUP_WINDOW "-setup\t\t\tDisplays the configuration dialog\n" #endif "-usecwd\t\t\tRead game data and configuration file from working directory\n"