diff --git a/README b/README index ec29dac2..2b7f9872 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ License (GFDL). =============================================================================== -FLAC - 1.0.3 - Contents +FLAC - 1.0.4_beta - Contents =============================================================================== - Introduction diff --git a/build/config.mk b/build/config.mk index 0e019984..9db20876 100644 --- a/build/config.mk +++ b/build/config.mk @@ -19,7 +19,7 @@ # GNU makefile fragment for emulating stuff normally done by configure # -VERSION=\"1.0.3\" +VERSION=\"1.0.4_beta\" ORDINALS_H = ../../include/FLAC/ordinals.h diff --git a/configure.in b/configure.in index fcf35555..41abcba9 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_INIT(src/flac/main.c) -AM_INIT_AUTOMAKE(flac, 1.0.3) +AM_INIT_AUTOMAKE(flac, 1.0.4_beta) # Function to configure paths for id3lib; search for 'meat' to get to the end. # adapted from ogg.m4 diff --git a/flac.pbproj/project.pbxproj b/flac.pbproj/project.pbxproj index f7f3a731..efb8bc6f 100644 --- a/flac.pbproj/project.pbxproj +++ b/flac.pbproj/project.pbxproj @@ -844,7 +844,7 @@ buildSettings = { HEADER_SEARCH_PATHS = include; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DFLAC__VERSION_STRING=\\\\\\\"1.0.3\\\\\\\""; + OTHER_CFLAGS = "-DFLAC__VERSION_STRING=\\\\\\\"1.0.4_beta\\\\\\\""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = flac; @@ -1721,7 +1721,7 @@ buildSettings = { HEADER_SEARCH_PATHS = include; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-DFLAC__VERSION_STRING=\\\\\\\"1.0.3\\\\\\\""; + OTHER_CFLAGS = "-DFLAC__VERSION_STRING=\\\\\\\"1.0.4_beta\\\\\\\""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = metaflac; diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc index f3edecc1..19f12002 100644 --- a/src/flac/Makefile.vc +++ b/src/flac/Makefile.vc @@ -21,10 +21,10 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -DFLAC__HAS_OGG -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -DFLAC__HAS_OGG -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index 736668e1..6db6fea8 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -30,9 +30,9 @@ #if defined _MSC_VER || defined __MINW32__ /* yet one more hack because of MSVC6: */ -const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4_beta 20020823"; +const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4_beta 20020910"; #else -const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC " FLAC__VERSION_STRING " 20020823"; +const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC " FLAC__VERSION_STRING " 20020910"; #endif const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc index 146e70df..75694ce9 100644 --- a/src/metaflac/Makefile.vc +++ b/src/metaflac/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc index 32522895..139421fb 100644 --- a/src/plugin_winamp2/Makefile.vc +++ b/src/plugin_winamp2/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc index 8f9f803f..c8af45f3 100644 --- a/src/test_libFLAC++/Makefile.vc +++ b/src/test_libFLAC++/Makefile.vc @@ -21,10 +21,10 @@ SUFFIXES = .cc !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif !IFDEF DEBUG diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc index ab6ef534..753e17cd 100644 --- a/src/test_libFLAC/Makefile.vc +++ b/src/test_libFLAC/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc index 10692be6..c9ca1679 100644 --- a/src/test_libOggFLAC++/Makefile.vc +++ b/src/test_libOggFLAC++/Makefile.vc @@ -21,10 +21,10 @@ SUFFIXES = .cc !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif !IFDEF DEBUG diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc index 5187b9ed..131b2623 100644 --- a/src/test_libOggFLAC/Makefile.vc +++ b/src/test_libOggFLAC/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif C_FILES= \ diff --git a/src/test_streams/Makefile.vc b/src/test_streams/Makefile.vc index b2fb4118..ca5baf0a 100644 --- a/src/test_streams/Makefile.vc +++ b/src/test_streams/Makefile.vc @@ -19,10 +19,10 @@ !IFDEF DEBUG .c.obj: - $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX /Od /D "_DEBUG" $< + $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.3\" -YX -DNODEBUG $< + $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $< !endif C_FILES= \