Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass VERSION define via compiler flags to libflac (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2014-03-06 03:59:12 +00:00
parent d631f2bdb1
commit 87c116cf1a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/lib.mak
View File

@ -347,6 +347,12 @@ ARCHFLAGS = -DWORDS_BIGENDIAN=0
endif endif
FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H=0 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS) -O0 FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H=0 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS) -O0
ifdef MSVC_BUILD
# vconv will convert the \" to just a "
FLACOPTS += -DVERSION=\\\"1.2.1\\\"
else
FLACOPTS += -DVERSION=\"1.2.1\"
endif
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
FLACOPTS += -Wno-unused-const-variable FLACOPTS += -Wno-unused-const-variable
endif endif

3
src/lib/libflac/include/FLAC/ordinals.h
View File

@ -77,7 +77,4 @@ typedef FLAC__uint8 FLAC__byte;
#define false 0 #define false 0
#endif #endif
// MAME addition -- seems lame to make this a command-line parameter
#define VERSION "1.2.1"
#endif #endif

4
src/lib/libflac/libFLAC/format.c
View File

@ -57,13 +57,13 @@
#endif #endif
/* VERSION should come from configure */ /* VERSION should come from configure */
FLAC_API const char *FLAC__VERSION_STRING = "1.2.1"; FLAC_API const char *FLAC__VERSION_STRING = VERSION;
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__ #if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__
/* yet one more hack because of MSVC6: */ /* yet one more hack because of MSVC6: */
FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.2.1 20070917"; FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.2.1 20070917";
#else #else
FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " "1.2.1" " 20070917"; FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20070917";
#endif #endif
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' };