mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-22 12:05:11 +00:00
strip out now-needless NOBZERO flag
This commit is contained in:
parent
0402ad463b
commit
5c9e3c60a7
1 changed files with 0 additions and 14 deletions
14
Makefile
14
Makefile
|
@ -22,8 +22,6 @@ TARGET_N64 = 0
|
||||||
|
|
||||||
# Build and optimize for Raspberry Pi(s)
|
# Build and optimize for Raspberry Pi(s)
|
||||||
TARGET_RPI ?= 0
|
TARGET_RPI ?= 0
|
||||||
# No BZERO (for building under MXE)
|
|
||||||
NO_BZERO ?= 0
|
|
||||||
# Compiler to use (ido or gcc)
|
# Compiler to use (ido or gcc)
|
||||||
COMPILER ?= ido
|
COMPILER ?= ido
|
||||||
|
|
||||||
|
@ -450,12 +448,6 @@ SDLCONFIG := $(CROSS)sdl2-config
|
||||||
ifeq ($(WINDOWS_BUILD),1)
|
ifeq ($(WINDOWS_BUILD),1)
|
||||||
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) `$(SDLCONFIG) --cflags`
|
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) `$(SDLCONFIG) --cflags`
|
||||||
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`
|
||||||
ifeq ($(CROSS),i686-w64-mingw32.static-)
|
|
||||||
ifeq ($(CROSS),x86_64-w64-mingw32.static-)
|
|
||||||
CC_CHECK += D_NOBZERO
|
|
||||||
CFLAGS += D_NOBZERO
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
else ifeq ($(TARGET_WEB),1)
|
else ifeq ($(TARGET_WEB),1)
|
||||||
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -s USE_SDL=2
|
CC_CHECK := $(CC) -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) -Wall -Wextra -Wno-format-security $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) -s USE_SDL=2
|
||||||
|
@ -469,12 +461,6 @@ endif
|
||||||
|
|
||||||
# Check for enhancement options
|
# Check for enhancement options
|
||||||
|
|
||||||
# Check for no bzero option
|
|
||||||
ifeq ($(NO_BZERO),1)
|
|
||||||
CC_CHECK += -DNO_BZERO
|
|
||||||
CFLAGS += -DNO_BZERO
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Check for Puppycam option
|
# Check for Puppycam option
|
||||||
ifeq ($(BETTERCAMERA),1)
|
ifeq ($(BETTERCAMERA),1)
|
||||||
CC_CHECK += -DBETTERCAMERA
|
CC_CHECK += -DBETTERCAMERA
|
||||||
|
|
Loading…
Reference in a new issue