Merge pull request #7566 from orbea/cleanup

Makefile.common: Cleanup.
This commit is contained in:
Twinaphex 2018-11-09 20:17:26 +01:00 committed by GitHub
commit 53787c19ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,7 +60,6 @@ ifeq ($(SCALER_NO_SIMD), 1)
DEFINES += -DSCALER_NO_SIMD
endif
ifeq ($(HAVE_PRESERVE_DYLIB),1)
DEFINES += -DNO_DLCLOSE
endif
@ -282,8 +281,6 @@ OBJ += runahead/copy_load_info.o \
runahead/secondary_core.o
endif
ifeq ($(HAVE_CC_RESAMPLER), 1)
DEFINES += -DHAVE_CC_RESAMPLER
OBJ += audio/drivers_resampler/cc_resampler.o
@ -551,6 +548,7 @@ ifeq ($(HAVE_ALSA), 1)
ifeq ($(HAVE_THREADS), 1)
OBJ += audio/drivers/alsathread.o
endif
LIBS += $(ALSA_LIBS)
DEFINES += $(ALSA_CFLAGS)
endif
@ -710,7 +708,6 @@ ifeq ($(HAVE_ZARCH), 1)
OBJ += menu/drivers/zarch.o
DEFINES += -DHAVE_ZARCH
endif
endif
ifeq ($(HAVE_XMB), 1)
@ -779,8 +776,7 @@ endif
ifeq ($(HAVE_OVERLAY), 1)
DEFINES += -DHAVE_OVERLAY
OBJ += \
tasks/task_overlay.o \
OBJ += tasks/task_overlay.o \
input/input_overlay.o \
led/drivers/led_overlay.o
endif
@ -1076,10 +1072,12 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
LIBS += $(EGL_LIBS)
endif
endif
ifeq ($(HAVE_OSMESA), 1)
OBJ += gfx/drivers_context/osmesa_ctx.o
LIBS += -lOSMesa
endif
ifeq ($(HAVE_FFMPEG), 1)
ifneq ($(C89_BUILD), 1)
ifneq ($(HAVE_OPENGLES), 1)
@ -1397,7 +1395,6 @@ DEFINES += -DENABLE_HLSL
GLSLANG_SOURCES += $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp)
endif
OBJ += $(GLSLANG_SOURCES:.cpp=.o)
endif
@ -1581,7 +1578,6 @@ endif
LIBS += $(V4L2_LIBS)
endif
# Things that depend on network availability
ifeq ($(HAVE_NETWORKING), 1)
@ -1637,7 +1633,6 @@ ifeq ($(HAVE_NETWORKING), 1)
cheevos/var.o \
cheevos/cond.o
ifeq ($(HAVE_LUA), 1)
DEFINES += -DHAVE_LUA \
-DLUA_32BITS \
@ -1678,7 +1673,6 @@ ifeq ($(HAVE_NETWORKING), 1)
else
DEFINES += -DRC_DISABLE_LUA
endif
endif
ifeq ($(HAVE_DISCORD), 1)
@ -1689,6 +1683,7 @@ ifeq ($(HAVE_NETWORKING), 1)
deps/discord-rpc/src/rpc_connection.o \
deps/discord-rpc/src/serialization.o \
discord/discord.o
ifneq ($(findstring Win32,$(OS)),)
OBJ += deps/discord-rpc/src/discord_register_win.o \
deps/discord-rpc/src/connection_win.o
@ -1702,7 +1697,6 @@ ifneq ($(findstring Darwin,$(OS)),)
OBJ += deps/discord-rpc/src/discord_register_osx.o \
deps/discord-rpc/src/connection_unix.o
endif
endif
ifeq ($(HAVE_NETWORKGAMEPAD), 1)
@ -1767,7 +1761,6 @@ ifeq ($(HAVE_FFMPEG), 1)
DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg
endif
ifeq ($(HAVE_COMPRESSION), 1)
DEFINES += -DHAVE_COMPRESSION
OBJ += tasks/task_decompress.o
@ -1787,9 +1780,12 @@ ifeq ($(HAVE_COCOA),1)
endif
ifneq ($(findstring DOS,$(OS)),)
OBJ += gfx/drivers/vga_gfx.o gfx/drivers_font/vga_font.o \
input/drivers/dos_input.o input/drivers_joypad/dos_joypad.o \
frontend/drivers/platform_dos.o input/drivers_keyboard/keyboard_event_dos.o
OBJ += gfx/drivers/vga_gfx.o \
gfx/drivers_font/vga_font.o \
input/drivers/dos_input.o \
input/drivers_joypad/dos_joypad.o \
frontend/drivers/platform_dos.o \
input/drivers_keyboard/keyboard_event_dos.o
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_vga.o