separate EXT_OPTIONS_MENU into its own option

This commit is contained in:
fgsfds 2020-05-14 00:33:12 +03:00
parent b8897eb5b4
commit 0446b244eb
1 changed files with 18 additions and 7 deletions

View File

@ -31,6 +31,8 @@ BETTERCAMERA ?= 0
NODRAWINGDISTANCE ?= 0 NODRAWINGDISTANCE ?= 0
# Disable texture fixes by default (helps with them purists) # Disable texture fixes by default (helps with them purists)
TEXTURE_FIX ?= 0 TEXTURE_FIX ?= 0
# Enable extended options menu by default
EXT_OPTIONS_MENU ?= 1
# Build for Emscripten/WebGL # Build for Emscripten/WebGL
TARGET_WEB ?= 0 TARGET_WEB ?= 0
@ -448,10 +450,13 @@ CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -W
CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv `$(SDLCONFIG) --cflags` CFLAGS := $(OPT_FLAGS) $(INCLUDE_CFLAGS) $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -fno-strict-aliasing -fwrapv `$(SDLCONFIG) --cflags`
endif endif
# Check for better camera option # Check for enhancement options
# Check for Puppycam option
ifeq ($(BETTERCAMERA),1) ifeq ($(BETTERCAMERA),1)
CC_CHECK += -DBETTERCAMERA -DEXT_OPTIONS_MENU CC_CHECK += -DBETTERCAMERA
CFLAGS += -DBETTERCAMERA -DEXT_OPTIONS_MENU CFLAGS += -DBETTERCAMERA
EXT_OPTIONS_MENU := 1
endif endif
# Check for no drawing distance option # Check for no drawing distance option
@ -466,6 +471,12 @@ CC_CHECK += -DTEXTURE_FIX
CFLAGS += -DTEXTURE_FIX CFLAGS += -DTEXTURE_FIX
endif endif
# Check for extended options menu option
ifeq ($(EXT_OPTIONS_MENU),1)
CC_CHECK += -DEXT_OPTIONS_MENU
CFLAGS += -DEXT_OPTIONS_MENU
endif
ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS) ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS)
ifeq ($(TARGET_WEB),1) ifeq ($(TARGET_WEB),1)