summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/libflac
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2014-03-06 03:59:12 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2014-03-06 03:59:12 +0000
commit87c116cf1aa5f99b1a4dceb9446f3e2bf7639d8d (patch)
treedf130d94d7e960a1fba2d4721344dc4d9fc0600f /src/lib/libflac
parentd631f2bdb177624b7a427a7098f7064a6d1b0b44 (diff)
pass VERSION define via compiler flags to libflac (nw)
Diffstat (limited to 'src/lib/libflac')
-rw-r--r--src/lib/libflac/include/FLAC/ordinals.h3
-rw-r--r--src/lib/libflac/libFLAC/format.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libflac/include/FLAC/ordinals.h b/src/lib/libflac/include/FLAC/ordinals.h
index 96ed4f8961f..a7a5cd96135 100644
--- a/src/lib/libflac/include/FLAC/ordinals.h
+++ b/src/lib/libflac/include/FLAC/ordinals.h
@@ -77,7 +77,4 @@ typedef FLAC__uint8 FLAC__byte;
#define false 0
#endif
-// MAME addition -- seems lame to make this a command-line parameter
-#define VERSION "1.2.1"
-
#endif
diff --git a/src/lib/libflac/libFLAC/format.c b/src/lib/libflac/libFLAC/format.c
index fcc104b7d82..a3f93ddc78c 100644
--- a/src/lib/libflac/libFLAC/format.c
+++ b/src/lib/libflac/libFLAC/format.c
@@ -57,13 +57,13 @@
#endif
/* 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__
/* yet one more hack because of MSVC6: */
FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.2.1 20070917";
#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
FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };