lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup Makefiles a bit

This commit is contained in:
David Guillen Fandos 2021-05-19 20:09:44 +02:00 committed by David G. F
parent ea2608812f
commit 261b2db9bb
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,5 +1,4 @@
DEBUG=0 DEBUG=0
HAVE_GRIFFIN=0
FRONTEND_SUPPORTS_RGB565=1 FRONTEND_SUPPORTS_RGB565=1
FORCE_32BIT_ARCH=0 FORCE_32BIT_ARCH=0
HAVE_MMAP=0 HAVE_MMAP=0
@ -74,7 +73,7 @@ ifeq ($(platform), unix)
LIBM := LIBM :=
endif endif
CFLAGS += $(FORCE_32BIT) CFLAGS += $(FORCE_32BIT)
LDFLAGS := -Wl,--no-undefined LDFLAGS += -Wl,--no-undefined
ifeq ($(HAVE_DYNAREC),1) ifeq ($(HAVE_DYNAREC),1)
HAVE_MMAP = 1 HAVE_MMAP = 1
endif endif
@ -368,7 +367,7 @@ else ifneq (,$(findstring armv,$(platform)))
ifeq (,$(findstring no-dynarec,$(platform))) ifeq (,$(findstring no-dynarec,$(platform)))
HAVE_DYNAREC := 1 HAVE_DYNAREC := 1
endif endif
LDFLAGS := -Wl,--no-undefined LDFLAGS += -Wl,--no-undefined
# MIPS # MIPS
else ifeq ($(platform), mips32) else ifeq ($(platform), mips32)
@ -444,11 +443,6 @@ else
OPTIMIZE := -O3 -DNDEBUG OPTIMIZE := -O3 -DNDEBUG
endif endif
include Makefile.common
OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
DEFINES := -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -Wall DEFINES := -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -Wall
ifeq ($(HAVE_DYNAREC), 1) ifeq ($(HAVE_DYNAREC), 1)
@ -463,6 +457,9 @@ else ifeq ($(CPU_ARCH), x86_32)
DEFINES += -DX86_ARCH DEFINES += -DX86_ARCH
endif endif
include Makefile.common
OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o)
WARNINGS_DEFINES = WARNINGS_DEFINES =
CODE_DEFINES = CODE_DEFINES =

4
Makefile.common
View File

@ -2,9 +2,6 @@ INCFLAGS := -I$(CORE_DIR)/libretro -I$(CORE_DIR)/src
SOURCES_ASM := $(CORE_DIR)/bios_data.S SOURCES_ASM := $(CORE_DIR)/bios_data.S
ifeq ($(HAVE_GRIFFIN), 1)
SOURCES_C := $(CORE_DIR)/gpsp_griffin.c
else
SOURCES_C := $(CORE_DIR)/main.c \ SOURCES_C := $(CORE_DIR)/main.c \
$(CORE_DIR)/cpu.c \ $(CORE_DIR)/cpu.c \
$(CORE_DIR)/gba_memory.c \ $(CORE_DIR)/gba_memory.c \
@ -18,7 +15,6 @@ SOURCES_C := $(CORE_DIR)/main.c \
ifeq ($(HAVE_DYNAREC), 1) ifeq ($(HAVE_DYNAREC), 1)
SOURCES_C += $(CORE_DIR)/cpu_threaded.c SOURCES_C += $(CORE_DIR)/cpu_threaded.c
endif endif
endif
ifeq ($(HAVE_DYNAREC), 1) ifeq ($(HAVE_DYNAREC), 1)