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

Makefile: Fold OSX_STARTUPWINDOW into STARTUP_WINDOW. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5941 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-11-28 04:35:27 +00:00
parent d8f31187e1
commit a7cc4e8419
6 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/Makefile
View file

@ -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

5
polymer/eduke32/Makefile.common
View file

@ -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

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

@ -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

24
polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj
View file

@ -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",

2
polymer/eduke32/platform/osxbuild.sh
View file

@ -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

2
polymer/eduke32/source/astub.c
View file

@ -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"