Makefile cleanup

This commit is contained in:
Tony Jansson 2020-11-08 23:37:21 +02:00
parent 34a36a61a0
commit bfbc6b0209
2 changed files with 9 additions and 9 deletions

View File

@ -381,12 +381,12 @@ ifeq ($(DEBUG), 1)
COMMONFLAGS += -O0 -g
else
COMMONFLAGS += -O3 -DNDEBUG
LDFLAGS += -Wl,--gc-sections -s
endif
include Makefile.common
COMMONFLAGS += -DWANT_ZLIB -DHAVE_CONFIG_H -D__LIBRETRO__ -DCORE_NAME=\"$(EMUTYPE)\"
LDFLAGS += -Wl,--gc-sections -s
COMMONFLAGS += -DCORE_NAME=\"$(EMUTYPE)\" -D__LIBRETRO__ -DWANT_ZLIB -DHAVE_CONFIG_H
include Makefile.common
OBJECTS += $(patsubst %.cpp,%.o,$(SOURCES_CXX:.cc=.o)) $(SOURCES_C:.c=.o)
CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS)
@ -399,7 +399,7 @@ LDFLAGS += -lm $(fpic)
#CFLAGS += -std=c99
CXXFLAGS += -std=c++98
$(info CFLAGS: $(CFLAGS))
$(info CFLAGS: $(COMMONFLAGS))
$(info -------)
ifeq ($(platform), theos_ios)

View File

@ -2,11 +2,6 @@ EMU := $(CORE_DIR)/vice/src
DEPS_DIR := $(CORE_DIR)/deps
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COMMONFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
INCFLAGS += \
-I$(CORE_DIR) \
-I$(CORE_DIR)/libretro \
@ -105,3 +100,8 @@ SOURCES_C += \
$(LIBRETRO_COMM_DIR)/memmap/memalign.c \
$(LIBRETRO_COMM_DIR)/hash/rhash.c
endif
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COMMONFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif