From 4ffa88c5a9fab1949a5451c9504e1ff9963e20eb Mon Sep 17 00:00:00 2001 From: mahoneyt944 <49591133+mahoneyt944@users.noreply.github.com> Date: Fri, 17 May 2024 06:36:24 -0400 Subject: [PATCH] COREDEFS never used (#506) --- Makefile | 2 +- jni/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index da3bbd90..96766ae5 100644 --- a/Makefile +++ b/Makefile @@ -848,7 +848,7 @@ DEFS = $(COREDEFINES) -Dasm=__asm__ CFLAGS += $(INCFLAGS) $(INCFLAGS_PLATFORM) # combine the various definitions to one -CDEFS = $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) +CDEFS = $(DEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.s=.o) diff --git a/jni/Android.mk b/jni/Android.mk index 2a35e5d9..e843eda8 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -5,7 +5,7 @@ CORE_DIR := $(ROOT_DIR)/src include $(ROOT_DIR)/Makefile.common -COREFLAGS := $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) -ffast-math -funroll-loops -DANDROID -DHAVE_ZLIB $(INCFLAGS) +COREFLAGS := $(DEFS) $(COREDEFINES) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) -ffast-math -funroll-loops -DANDROID -DHAVE_ZLIB $(INCFLAGS) GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" ifneq ($(GIT_VERSION)," unknown")