Move more to Makefile.common

This commit is contained in:
twinaphex 2014-09-14 04:37:57 +02:00
parent edea06292e
commit a59c9247ed
2 changed files with 9 additions and 10 deletions

View File

@ -27,6 +27,10 @@ ifeq ($(HAVE_HARD_FLOAT), 1)
DEFINES += -mfloat-abi=hard
endif
ifeq ($(TDM_GCC),)
LDCXXFLAGS += -static-libstdc++
endif
# System
ifneq ($(findstring BSD,$(OS)),)
@ -121,6 +125,11 @@ OBJ += frontend/frontend.o \
# Miscellaneous
ifeq ($(HAVE_STDIN_CMD), 1)
DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
OBJ += command.o
endif
ifeq ($(HAVE_PYTHON), 1)
DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter
LIBS += $(PYTHON_LIBS)

View File

@ -83,11 +83,6 @@ endif
libretro ?= -lretro
ifeq ($(TDM_GCC),)
LDCXXFLAGS += -static-libstdc++
endif
ifeq ($(HAVE_ZLIB), 1)
ZLIB_OBJS = deps/rzlib/unzip.o \
deps/rzlib/ioapi.o \
@ -108,11 +103,6 @@ ifeq ($(HAVE_ZLIB), 1)
endif
endif
ifeq ($(HAVE_STDIN_CMD), 1)
DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
OBJ += command.o
endif
ifeq ($(DYNAMIC), 1)
DEFINES += -DHAVE_DYNAMIC
else