zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add "OSX_STARTUPWINDOW" Makefile variable to toggle the OS X startup window. Off by default.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2426 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-08 06:07:10 +00:00
parent 93be45cb1a
commit 9f78a773f1
7 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/Makefile
View file

@ -212,8 +212,10 @@ ifeq ($(PLATFORM),DARWIN)
-Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
-Wl,-framework,QuickTime -lm
endif
ifneq (0,$(OSX_STARTUPWINDOW))
EDITOROBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
GAMEOBJS+=$(OBJ)/GrpFile.game.$o $(OBJ)/GameListSource.game.$o $(OBJ)/StartupWinController.game.$o
endif
NASMFLAGS += -f macho
endif

5
polymer/eduke32/Makefile.common
View file

@ -13,6 +13,8 @@ DXROOT_OVERRIDE:=
# Mac OS X Frameworks location
# Like above, use absolute paths.
APPLE_FRAMEWORKS ?=/Library/Frameworks
# Since the OS X startup window is generating errors, disable it by default.
OSX_STARTUPWINDOW ?= 0
# Engine options
# USE_OPENGL - enables basic OpenGL Polymost renderer
@ -163,6 +165,9 @@ endif
ifneq (0,$(USE_LIBVPX))
BASECFLAGS+= -DUSE_LIBVPX
endif
ifneq (0,$(OSX_STARTUPWINDOW))
BASECFLAGS+= -DOSX_STARTUPWINDOW
endif
ifneq (0,$(EFENCE))
LIBS+= -lefence

5
polymer/eduke32/build/Makefile
View file

@ -121,7 +121,10 @@ ifeq ($(PLATFORM),LINUX)
ASFLAGS+= -f elf
endif
ifeq ($(PLATFORM),DARWIN)
ENGINEOBJS += $(OBJ)/osxbits.$o $(OBJ)/StartupWinController.editor.$o
ENGINEOBJS += $(OBJ)/osxbits.$o
ifneq (0,$(OSX_STARTUPWINDOW))
ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o
endif
ASFLAGS += -f macho -DUNDERSCORES
OURCFLAGS += -fno-pic -DUNDERSCORES
endif

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

@ -479,7 +479,7 @@ void M32_DrawRoomsAndMasks(void)
}
#undef STARTUP_SETUP_WINDOW
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
# define STARTUP_SETUP_WINDOW
#endif

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

@ -8409,7 +8409,7 @@ static void G_ShowParameterHelp(void)
"-check\t\tEnables map pointer checking when saving\n"
"-namesfile FILE\tUses FILE instead of NAMES.H for tile names\n"
"-nocheck\t\tDisables map pointer checking when saving (default)\n" // kept for script compat
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
"-setup\t\tDisplays the configuration dialog\n"
#endif
#if !defined(_WIN32)

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

@ -7975,7 +7975,7 @@ static void G_ShowParameterHelp(void)
"-r\t\tRecord demo\n"
"-s#\t\tSet skill level (1-4)\n"
"-server\t\tStart a multiplayer game for other players to join\n"
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2))
#if defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
"-setup/nosetup\tEnables/disables startup window\n"
#endif
"-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n"
@ -10001,7 +10001,7 @@ int32_t app_main(int32_t argc,const char **argv)
else if (!fg) g_gameNamePtr = "Unknown GRP";
}
#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2)))
#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)))
if (i < 0 || (!g_noSetup && (ud.configversion != BYTEVERSION_JF || ud.config.ForceSetup)) || g_commandSetup)
{
if (quitevent || !startwin_run())

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

@ -5869,7 +5869,7 @@ void C_Compile(const char *filenam)
}
else
{
#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && (defined __APPLE__ || defined HAVE_GTK2)))
#if (defined RENDERTYPEWIN || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)))
while (!quitevent) // keep the window open so people can copy CON errors out of it
handleevents();
#endif