Strip out rxml and yxml if HAVE_VIDEO_LAYOUT is not defined

This commit is contained in:
twinaphex 2019-11-17 20:43:26 +01:00
parent 8e6e30370d
commit c252cbe9e0
2 changed files with 5 additions and 2 deletions

View File

@ -853,6 +853,9 @@ ifeq ($(HAVE_VIDEO_LAYOUT), 1)
gfx/video_layout/internal.o \ gfx/video_layout/internal.o \
gfx/video_layout/scope.o \ gfx/video_layout/scope.o \
gfx/video_layout/load.o gfx/video_layout/load.o
OBJ += \
$(LIBRETRO_COMM_DIR)/formats/xml/rxml.o \
deps/yxml/yxml.o
endif endif
ifeq ($(HAVE_STB_FONT), 1) ifeq ($(HAVE_STB_FONT), 1)
@ -1717,8 +1720,6 @@ endif
OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \ OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \
$(LIBRETRO_COMM_DIR)/formats/json/jsonsax.o \ $(LIBRETRO_COMM_DIR)/formats/json/jsonsax.o \
$(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \ $(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \
$(LIBRETRO_COMM_DIR)/formats/xml/rxml.o \
deps/yxml/yxml.o \
$(LIBRETRO_COMM_DIR)/formats/image_transfer.o $(LIBRETRO_COMM_DIR)/formats/image_transfer.o
# Easter Egg # Easter Egg

View File

@ -1485,8 +1485,10 @@ DEPENDENCIES
/*============================================================ /*============================================================
XML XML
============================================================ */ ============================================================ */
#ifdef HAVE_VIDEO_LAYOUT
#include "../libretro-common/formats/xml/rxml.c" #include "../libretro-common/formats/xml/rxml.c"
#include "../deps/yxml/yxml.c" #include "../deps/yxml/yxml.c"
#endif
/*============================================================ /*============================================================
AUDIO UTILS AUDIO UTILS