Uniquely namespace libchdr source files

This commit is contained in:
twinaphex 2018-04-22 12:10:15 +02:00
parent ca9dd89975
commit db314ff82f
7 changed files with 10 additions and 10 deletions

View File

@ -1500,11 +1500,11 @@ ifeq ($(HAVE_7ZIP), 1)
ifeq ($(HAVE_ZLIB), 1)
DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
CFLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/bitstream.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/cdrom.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/chd.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/flac.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/huffman.o \
OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
$(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
$(LIBRETRO_COMM_DIR)/streams/chd_stream.o
endif
endif

View File

@ -1307,11 +1307,11 @@ DEPENDENCIES
#endif
#ifdef HAVE_CHD
#include "../libretro-common/formats/libchdr/bitstream.c"
#include "../libretro-common/formats/libchdr/cdrom.c"
#include "../libretro-common/formats/libchdr/chd.c"
#include "../libretro-common/formats/libchdr/flac.c"
#include "../libretro-common/formats/libchdr/huffman.c"
#include "../libretro-common/formats/libchdr/libchdr_bitstream.c"
#include "../libretro-common/formats/libchdr/libchdr_cdrom.c"
#include "../libretro-common/formats/libchdr/libchdr_chd.c"
#include "../libretro-common/formats/libchdr/libchdr_flac.c"
#include "../libretro-common/formats/libchdr/libchdr_huffman.c"
#include "../libretro-common/streams/chd_stream.c"
#endif