bump the version number from 1.0.4_beta to 1.0.4

diff --git a/README b/README
index e50cecd..f390d18 100644 (file)
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ License (GFDL).
 
 
 ===============================================================================
-FLAC - 1.0.4_beta - Contents
+FLAC - 1.0.4 - Contents
 ===============================================================================
 
 - Introduction

diff --git a/build/config.mk b/build/config.mk
index 9db2087..460dc1d 100644 (file)
--- 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.4_beta\"
+VERSION=\"1.0.4\"
 
 ORDINALS_H = ../../include/FLAC/ordinals.h
 

diff --git a/configure.in b/configure.in
index 8eadd44..a6d41b7 100644 (file)
--- 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.4_beta)
+AM_INIT_AUTOMAKE(flac, 1.0.4)
 
 # 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 efb8bc6..7c42437 100644 (file)
--- 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.4_beta\\\\\\\"";
+                               OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.0.4\\\\\\\"";
                                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.4_beta\\\\\\\"";
+                               OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.0.4\\\\\\\"";
                                OTHER_LDFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = metaflac;

diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc
index 6bfe5f7..f04af30 100644 (file)
--- a/src/flac/Makefile.vc
+++ b/src/flac/Makefile.vc
@@ -21,10 +21,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -DFLAC__HAS_OGG -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index 5346601..a47967c 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -22,10 +22,10 @@ NASM=nasmw
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) /D "_LIB" /D FLAC__CPU_IA32 /D FLAC__HAS_NASM /D NO_VFORK /D FLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+       $(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /D "_LIB" /D FLAC__CPU_IA32 /D FLAC__HAS_NASM /D NO_VFORK /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
+       $(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc
index 75694ce..eae9291 100644 (file)
--- a/src/metaflac/Makefile.vc
+++ b/src/metaflac/Makefile.vc
@@ -19,10 +19,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc
index 139421f..0e4f066 100644 (file)
--- a/src/plugin_winamp2/Makefile.vc
+++ b/src/plugin_winamp2/Makefile.vc
@@ -19,10 +19,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc
index c8af45f..d8ff518 100644 (file)
--- a/src/test_libFLAC++/Makefile.vc
+++ b/src/test_libFLAC++/Makefile.vc
@@ -21,10 +21,10 @@ SUFFIXES = .cc
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 !IFDEF DEBUG\r

diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc
index 753e17c..94d6cf6 100644 (file)
--- a/src/test_libFLAC/Makefile.vc
+++ b/src/test_libFLAC/Makefile.vc
@@ -19,10 +19,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc
index c9ca167..70932a3 100644 (file)
--- a/src/test_libOggFLAC++/Makefile.vc
+++ b/src/test_libOggFLAC++/Makefile.vc
@@ -21,10 +21,10 @@ SUFFIXES = .cc
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 !IFDEF DEBUG\r

diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc
index 131b262..2936d60 100644 (file)
--- a/src/test_libOggFLAC/Makefile.vc
+++ b/src/test_libOggFLAC/Makefile.vc
@@ -19,10 +19,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/test_streams/Makefile.vc b/src/test_streams/Makefile.vc
index ca5baf0..0baa8b5 100644 (file)
--- a/src/test_streams/Makefile.vc
+++ b/src/test_streams/Makefile.vc
@@ -19,10 +19,10 @@
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
 !else\r
 .c.obj:\r
-       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4_beta\" -YX -DNODEBUG $<\r
+       $(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r