This commit is contained in:
twinaphex 2016-01-23 18:22:27 +01:00
parent bcdff2e438
commit 15e5041062
2 changed files with 29 additions and 24 deletions

View File

@ -210,7 +210,6 @@ RM = @rm -f
# some structures and thus they can't be linked against each other. # some structures and thus they can't be linked against each other.
DEFS = -DINLINE="static __inline__" -Dasm=__asm__ DEFS = -DINLINE="static __inline__" -Dasm=__asm__
CFLAGS = -I$(CORE_DIR) -I$(CORE_DIR)/includes -I$(CORE_DIR)/libretro -I$(CORE_DIR)/cpu/m68000 -I$(CORE_DIR)/cpu/m68000
RETRO_PROFILE = 0 RETRO_PROFILE = 0
CFLAGS += -DRETRO_PROFILE=$(RETRO_PROFILE) CFLAGS += -DRETRO_PROFILE=$(RETRO_PROFILE)
@ -240,35 +239,14 @@ SOURCES_C :=
# include the various .mak files # include the various .mak files
include Makefile.common include Makefile.common
all: $(TARGET) CFLAGS += $(INCFLAGS)
# platform .mak files will want to add to this
ifeq ($(STATIC_LINKING),1)
CFLAGS += -I$(CORE_DIR)/libretro/includes/zlib
else
SOURCES_C += deps/zlib/adler32.c \
deps/zlib/compress.c \
deps/zlib/crc32.c \
deps/zlib/deflate.c \
deps/zlib/gzclose.c \
deps/zlib/gzlib.c \
deps/zlib/gzread.c \
deps/zlib/gzwrite.c \
deps/zlib/inffast.c \
deps/zlib/inflate.c \
deps/zlib/inftrees.c \
deps/zlib/trees.c \
deps/zlib/uncompr.c \
deps/zlib/zutil.c \
deps/zlib/ioapi.c \
deps/zlib/unzip.c
endif
# combine the various definitions to one # combine the various definitions to one
CDEFS = $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS) CDEFS = $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS)
OBJECTS := $(SOURCES_C:.c=.o) OBJECTS := $(SOURCES_C:.c=.o)
# primary target all: $(TARGET)
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING),1) ifeq ($(STATIC_LINKING),1)
@echo Archiving $@... @echo Archiving $@...

View File

@ -1,3 +1,9 @@
INCFLAGS := -I$(CORE_DIR) \
-I$(CORE_DIR)/includes \
-I$(CORE_DIR)/libretro \
-I$(CORE_DIR)/cpu/m68000 \
-I$(CORE_DIR)/cpu/m68000
SOURCES_C += $(CORE_DIR)/libretro/libretro.c \ SOURCES_C += $(CORE_DIR)/libretro/libretro.c \
$(CORE_DIR)/libretro/osd.c \ $(CORE_DIR)/libretro/osd.c \
$(CORE_DIR)/libretro/keyboard.c \ $(CORE_DIR)/libretro/keyboard.c \
@ -2564,3 +2570,24 @@ SOURCES_C += $(CORE_DIR)/sound/ymf271.c
else else
SOUNDDEFS += -DHAS_YMF271=0 SOUNDDEFS += -DHAS_YMF271=0
endif endif
ifeq ($(STATIC_LINKING),1)
INCFLAGS += -I$(CORE_DIR)/libretro/includes/zlib
else
SOURCES_C += deps/zlib/adler32.c \
deps/zlib/compress.c \
deps/zlib/crc32.c \
deps/zlib/deflate.c \
deps/zlib/gzclose.c \
deps/zlib/gzlib.c \
deps/zlib/gzread.c \
deps/zlib/gzwrite.c \
deps/zlib/inffast.c \
deps/zlib/inflate.c \
deps/zlib/inftrees.c \
deps/zlib/trees.c \
deps/zlib/uncompr.c \
deps/zlib/zutil.c \
deps/zlib/ioapi.c \
deps/zlib/unzip.c
endif