mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Makefile.common) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-04-04 21:45:59 +02:00
parent 7c92d2f99d
commit 081bbe532f
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Makefile.common
View File

@ -68,7 +68,8 @@ endif
ifneq ($(findstring Linux,$(OS)),) ifneq ($(findstring Linux,$(OS)),)
LIBS += -lrt LIBS += -lrt
JOYCONFIG_LIBS += -lrt JOYCONFIG_LIBS += -lrt
OBJ += input/drivers/linuxraw_input.o input/drivers_joypad/linuxraw_joypad.o OBJ += input/drivers/linuxraw_input.o \
input/drivers_joypad/linuxraw_joypad.o
endif endif
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
@ -223,7 +224,8 @@ ifeq ($(HAVE_OSS_BSD), 1)
endif endif
ifeq ($(HAVE_ALSA), 1) ifeq ($(HAVE_ALSA), 1)
OBJ += audio/drivers/alsa.o audio/drivers/alsathread.o OBJ += audio/drivers/alsa.o \
audio/drivers/alsathread.o
LIBS += $(ALSA_LIBS) LIBS += $(ALSA_LIBS)
DEFINES += $(ALSA_CFLAGS) DEFINES += $(ALSA_CFLAGS)
endif endif
@ -280,8 +282,8 @@ endif
# Audio Resamplers # Audio Resamplers
ifeq ($(HAVE_NEON),1) ifeq ($(HAVE_NEON),1)
OBJ += audio/drivers_resampler/sinc_neon.o OBJ += audio/drivers_resampler/sinc_neon.o \
OBJ += audio/drivers_resampler/cc_resampler_neon.o audio/drivers_resampler/cc_resampler_neon.o
# When compiled without this, tries to attempt to compile sinc lerp, # When compiled without this, tries to attempt to compile sinc lerp,
# which will error out # which will error out
# #
@ -343,7 +345,10 @@ ifeq ($(HAVE_FREETYPE), 1)
endif endif
ifeq ($(HAVE_THREADS), 1) ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o libretro-common/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o OBJ += autosave.o \
libretro-common/rthreads/rthreads.o \
gfx/video_thread_wrapper.o \
audio/audio_thread_wrapper.o
DEFINES += -DHAVE_THREADS DEFINES += -DHAVE_THREADS
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread LIBS += -lpthread
@ -393,7 +398,8 @@ ifeq ($(HAVE_UDEV), 1)
DEFINES += $(UDEV_CFLAGS) DEFINES += $(UDEV_CFLAGS)
LIBS += $(UDEV_LIBS) LIBS += $(UDEV_LIBS)
JOYCONFIG_LIBS += $(UDEV_LIBS) JOYCONFIG_LIBS += $(UDEV_LIBS)
OBJ += input/drivers/udev_input.o input/drivers_joypad/udev_joypad.o OBJ += input/drivers/udev_input.o \
input/drivers_joypad/udev_joypad.o
endif endif
ifeq ($(HAVE_LIBUSB), 1) ifeq ($(HAVE_LIBUSB), 1)
@ -487,8 +493,8 @@ ifeq ($(HAVE_OPENGL), 1)
LIBS += -framework OpenGL LIBS += -framework OpenGL
else ifneq ($(findstring Win32,$(OS)),) else ifneq ($(findstring Win32,$(OS)),)
LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32 LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
OBJ += gfx/drivers_context/wgl_ctx.o OBJ += gfx/drivers_context/wgl_ctx.o \
OBJ += gfx/drivers_wm/win32_shader_dlg.o gfx/drivers_wm/win32_shader_dlg.o
else else
LIBS += -lGL LIBS += -lGL
endif endif
@ -503,7 +509,10 @@ ifeq ($(HAVE_SDL2), 1)
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/drivers/sdl_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o OBJ += gfx/drivers/sdl_gfx.o \
input/drivers/sdl_input.o \
input/drivers_joypad/sdl_joypad.o \
audio/drivers/sdl_audio.o
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/drivers_context/sdl_gl_ctx.o OBJ += gfx/drivers_context/sdl_gl_ctx.o
@ -515,7 +524,10 @@ ifeq ($(HAVE_SDL), 1)
endif endif
ifeq ($(HAVE_SDL2), 1) ifeq ($(HAVE_SDL2), 1)
OBJ += gfx/drivers/sdl2_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o OBJ += gfx/drivers/sdl2_gfx.o \
input/drivers/sdl_input.o \
input/drivers_joypad/sdl_joypad.o \
audio/drivers/sdl_audio.o
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/drivers_context/sdl_gl_ctx.o OBJ += gfx/drivers_context/sdl_gl_ctx.o
@ -532,7 +544,8 @@ ifeq ($(HAVE_OMAP), 1)
endif endif
ifeq ($(HAVE_EXYNOS), 1) ifeq ($(HAVE_EXYNOS), 1)
OBJ += gfx/drivers/exynos_gfx.o mem/neon/memcpy-neon.o OBJ += gfx/drivers/exynos_gfx.o \
mem/neon/memcpy-neon.o
LIBS += $(DRM_LIBS) $(EXYNOS_LIBS) LIBS += $(DRM_LIBS) $(EXYNOS_LIBS)
DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS) DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS)
endif endif
@ -544,11 +557,13 @@ ifeq ($(HAVE_DISPMANX), 1)
endif endif
ifeq ($(HAVE_SUNXI), 1) ifeq ($(HAVE_SUNXI), 1)
OBJ += gfx/drivers/sunxi_gfx.o gfx/pixman/pixman-arm-neon-asm.o OBJ += gfx/drivers/sunxi_gfx.o \
gfx/pixman/pixman-arm-neon-asm.o
endif endif
ifeq ($(HAVE_VG), 1) ifeq ($(HAVE_VG), 1)
OBJ += gfx/drivers/vg.o libretro-common/gfx/math/matrix_3x3.o OBJ += gfx/drivers/vg.o \
libretro-common/gfx/math/matrix_3x3.o
DEFINES += $(VG_CFLAGS) DEFINES += $(VG_CFLAGS)
LIBS += $(VG_LIBS) LIBS += $(VG_LIBS)
endif endif
@ -654,7 +669,8 @@ ifeq ($(WANT_ZLIB),1)
deps/zlib/unzip.o deps/zlib/unzip.o
else else
ifeq ($(HAVE_ZLIB),1) ifeq ($(HAVE_ZLIB),1)
ZLIB_OBJS = deps/zlib/unzip.o deps/zlib/ioapi.o ZLIB_OBJS = deps/zlib/unzip.o \
deps/zlib/ioapi.o
OBJ += $(ZLIB_OBJS) OBJ += $(ZLIB_OBJS)
HAVE_ZLIB_DEFLATE = 1 HAVE_ZLIB_DEFLATE = 1
endif endif