mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qb: Fix undefined flac references with C89_BUILD=1

Browse Source
This commit is contained in:
orbea 2017-12-30 20:51:44 -08:00
parent c96ae959b3
commit 24f69cb537
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Makefile.common
View File

@ -1348,49 +1348,34 @@ ifeq ($(HAVE_IBXM), 1)
OBJ += $(DEPS_DIR)/ibxm/ibxm.o OBJ += $(DEPS_DIR)/ibxm/ibxm.o
endif endif
ifeq ($(HAVE_FLAC),1) ifeq ($(HAVE_BUILTINFLAC),1)
DEFINES += -DHAVE_FLAC CFLAGS += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include
ifeq ($(HAVE_BUILTINFLAC),1) DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
CFLAGS += -I$(DEPS_DIR)/libFLAC/include -DFLAC_PACKAGE_VERSION="\"retroarch\""
DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \ FLACOBJ = $(DEPS_DIR)/libFLAC/bitmath.o \
-DFLAC_PACKAGE_VERSION="\"retroarch\"" $(DEPS_DIR)/libFLAC/bitreader.o \
FLACOBJ = $(DEPS_DIR)/libFLAC/bitmath.o \ $(DEPS_DIR)/libFLAC/cpu.o \
$(DEPS_DIR)/libFLAC/bitreader.o \ $(DEPS_DIR)/libFLAC/crc.o \
$(DEPS_DIR)/libFLAC/cpu.o \ $(DEPS_DIR)/libFLAC/fixed.o \
$(DEPS_DIR)/libFLAC/crc.o \ $(DEPS_DIR)/libFLAC/float.o \
$(DEPS_DIR)/libFLAC/fixed.o \ $(DEPS_DIR)/libFLAC/format.o \
$(DEPS_DIR)/libFLAC/float.o \ $(DEPS_DIR)/libFLAC/lpc.o \
$(DEPS_DIR)/libFLAC/format.o \ $(DEPS_DIR)/libFLAC/lpc_intrin_avx2.o \
$(DEPS_DIR)/libFLAC/lpc.o \ $(DEPS_DIR)/libFLAC/lpc_intrin_sse2.o \
$(DEPS_DIR)/libFLAC/lpc_intrin_avx2.o \ $(DEPS_DIR)/libFLAC/lpc_intrin_sse41.o \
$(DEPS_DIR)/libFLAC/lpc_intrin_sse2.o \ $(DEPS_DIR)/libFLAC/lpc_intrin_sse.o \
$(DEPS_DIR)/libFLAC/lpc_intrin_sse41.o \ $(DEPS_DIR)/libFLAC/md5.o \
$(DEPS_DIR)/libFLAC/lpc_intrin_sse.o \ $(DEPS_DIR)/libFLAC/memory.o \
$(DEPS_DIR)/libFLAC/md5.o \ $(DEPS_DIR)/libFLAC/stream_decoder.o
$(DEPS_DIR)/libFLAC/memory.o \ ifneq ($(findstring Win32,$(OS)),)
$(DEPS_DIR)/libFLAC/stream_decoder.o DEFINES += -DHAVE_FSEEKO
ifneq ($(findstring Win32,$(OS)),) # make sure not to use this on legacy Windows versions that don't have W-functions implemented
DEFINES += -DHAVE_FSEEKO DEFINES += -DNEED_UTF8_SUPPORT
# make sure not to use this on legacy Windows versions that don't have W-functions implemented FLACOBJ += $(DEPS_DIR)/libFLAC/windows_unicode_filenames.o
DEFINES += -DNEED_UTF8_SUPPORT
FLACOBJ += $(DEPS_DIR)/libFLAC/windows_unicode_filenames.o
endif
OBJ += $(FLACOBJ)
else
LIBS += $(FLAC_LIBS)
endif
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 \
$(LIBRETRO_COMM_DIR)/streams/chd_stream.o
endif
endif endif
OBJ += $(FLACOBJ)
else ifeq ($(HAVE_FLAC),1)
LIBS += $(FLAC_LIBS)
endif endif
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
@ -1420,6 +1405,21 @@ ifeq ($(HAVE_ZLIB), 1)
endif endif
endif endif
ifeq ($(HAVE_FLAC), 1)
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 \
$(LIBRETRO_COMM_DIR)/streams/chd_stream.o
endif
endif
endif
ifeq ($(HAVE_RTGA), 1) ifeq ($(HAVE_RTGA), 1)
DEFINES += -DHAVE_RTGA DEFINES += -DHAVE_RTGA
OBJ += $(LIBRETRO_COMM_DIR)/formats/tga/rtga.o OBJ += $(LIBRETRO_COMM_DIR)/formats/tga/rtga.o

8
qb/config.libs.sh
View File

@ -275,13 +275,11 @@ fi
if [ "$HAVE_FLAC" = 'no' ]; then if [ "$HAVE_FLAC" = 'no' ]; then
HAVE_BUILTINFLAC=no HAVE_BUILTINFLAC=no
elif [ "$HAVE_BUILTINFLAC" = 'yes' ]; then
HAVE_FLAC=yes
else
check_pkgconf FLAC flac
check_val '' FLAC '-lFLAC'
fi fi
check_pkgconf FLAC flac
check_val '' FLAC '-lFLAC'
check_pkgconf LIBUSB libusb-1.0 1.0.13 check_pkgconf LIBUSB libusb-1.0 1.0.13
if [ "$OS" = 'Win32' ]; then if [ "$OS" = 'Win32' ]; then