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

Merge pull request #9206 from orbea/sixel

Browse Source 
qb: Use check_val for caca and sixel.
This commit is contained in:
Twinaphex 2019-07-29 22:48:55 +02:00 committed by GitHub
commit 0ae7560026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -1108,7 +1108,8 @@ endif
ifeq ($(HAVE_CACA), 1) ifeq ($(HAVE_CACA), 1)
DEFINES += -DHAVE_CACA DEFINES += -DHAVE_CACA
OBJ += gfx/drivers/caca_gfx.o gfx/drivers_font/caca_font.o OBJ += gfx/drivers/caca_gfx.o gfx/drivers_font/caca_font.o
LIBS += -lcaca LIBS += $(CACA_LIBS)
DEF_FLAGS += $(CACA_CFLAGS)
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_caca.o OBJ += menu/drivers_display/menu_display_caca.o
@ -1121,6 +1122,7 @@ ifeq ($(HAVE_SIXEL), 1)
OBJ += gfx/drivers/sixel_gfx.o gfx/drivers_font/sixel_font.o \ OBJ += gfx/drivers/sixel_gfx.o gfx/drivers_font/sixel_font.o \
gfx/drivers_context/sixel_ctx.o gfx/drivers_context/sixel_ctx.o
LIBS += $(SIXEL_LIBS) LIBS += $(SIXEL_LIBS)
DEF_FLAGS += $(SIXEL_CFLAGS)
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_sixel.o OBJ += menu/drivers_display/menu_display_sixel.o

4
qb/config.libs.sh
View File

@ -202,8 +202,8 @@ if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then
fi fi
check_val '' ALSA -lasound alsa alsa '' '' false check_val '' ALSA -lasound alsa alsa '' '' false
check_lib '' CACA -lcaca check_val '' CACA -lcaca '' caca '' '' false
check_lib '' SIXEL -lsixel check_val '' SIXEL -lsixel '' libsixel 1.6.0 '' false
check_macro AUDIOIO AUDIO_SETINFO sys/audioio.h check_macro AUDIOIO AUDIO_SETINFO sys/audioio.h