fixes for building static libs (new FLAC__NO_DLL #define)

diff --git a/include/share/getopt.h b/include/share/getopt.h
index 0cb909a..b8285a5 100644 (file)
--- a/include/share/getopt.h
+++ b/include/share/getopt.h
@@ -34,7 +34,7 @@
 #ifndef FLAC__SHARE__GETOPT_H
 #define FLAC__SHARE__GETOPT_H
 
-#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define GETOPT_API
 
 #else

diff --git a/include/share/utf8.h b/include/share/utf8.h
index 38190f1..24541f5 100644 (file)
--- a/include/share/utf8.h
+++ b/include/share/utf8.h
@@ -1,7 +1,7 @@
 #ifndef FLAC__SHARE__UTF8_H
 #define FLAC__SHARE__UTF8_H
 
-#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define UTF8_API
 
 #else

diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc
index f04af30..cf313ed 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 -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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 -DFLAC__HAS_OGG -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc
index eae9291..6f1e3a2 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 -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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 -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /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 0e4f066..f3527f6 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\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL /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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /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 4ac5f03..5881f53 100644 (file)
--- a/src/test_libFLAC++/Makefile.vc
+++ b/src/test_libFLAC++/Makefile.vc
@@ -21,18 +21,18 @@ SUFFIXES = .cpp
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 !IFDEF DEBUG\r
 .cpp.obj:\r
-       $(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
 .cpp.obj:\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc
index 94d6cf6..1981a3d 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\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /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 cc39114..3014080 100644 (file)
--- a/src/test_libOggFLAC++/Makefile.vc
+++ b/src/test_libOggFLAC++/Makefile.vc
@@ -21,18 +21,18 @@ SUFFIXES = .cpp
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 !IFDEF DEBUG\r
 .cpp.obj:\r
-       $(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
 .cpp.obj:\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r

diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc
index 2936d60..9708438 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\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /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 0baa8b5..9aba7b4 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\" -YX /Od /D "_DEBUG" $<\r
+       $(cc) -DFLAC__NO_DLL $(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\" -YX -DNODEBUG $<\r
+       $(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r