ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't confuse libflac PACKAGE_VERSION with RetroArch's

This commit is contained in:
Brad Parker 2017-09-18 20:21:37 -04:00
parent 770640be58
commit 2c45f0c31e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -1311,7 +1311,7 @@ endif
ifeq ($(HAVE_FLAC),1) ifeq ($(HAVE_FLAC),1)
CFLAGS += -I$(DEPS_DIR)/libFLAC/include CFLAGS += -I$(DEPS_DIR)/libFLAC/include
DEFINES += -DHAVE_FLAC -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \ DEFINES += -DHAVE_FLAC -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
-DPACKAGE_VERSION="\"retroarch\"" -DFLAC_PACKAGE_VERSION="\"retroarch\""
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
DEFINES += -DHAVE_FSEEKO DEFINES += -DHAVE_FSEEKO
endif endif

6
deps/libFLAC/format.c vendored
View File

@ -44,10 +44,10 @@
#include "private/format.h" #include "private/format.h"
#include "private/macros.h" #include "private/macros.h"
/* PACKAGE_VERSION should come from configure */ /* FLAC_PACKAGE_VERSION should come from configure */
FLAC_API const char *FLAC__VERSION_STRING = PACKAGE_VERSION; FLAC_API const char *FLAC__VERSION_STRING = FLAC_PACKAGE_VERSION;
FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " PACKAGE_VERSION " 20170101"; FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " FLAC_PACKAGE_VERSION " 20170101";
FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143; FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143;