tweak compiler options

diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc
index e0d7cdf..1dc4ec6 100644 (file)
--- a/src/flac/Makefile.vc
+++ b/src/flac/Makefile.vc
@@ -1,25 +1,25 @@
-!include <win32.mak>
-
-!IFDEF DEBUG
-.c.obj:
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<
-!else
-.c.obj:
-       $(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /O2 -DNODEBUG $<
-!endif
-
-C_FILES= \
-       decode.c \
-       encode.c \
-       main.c
-
-OBJS= $(C_FILES:.c=.obj)
-
-all: flac.exe
-
-flac.exe: $(OBJS)
-       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib
-
-clean:
-       -del *.obj *.pch
-       -del ..\..\obj\bin\flac.exe
+!include <win32.mak>\r
+\r
+!IFDEF DEBUG\r
+.c.obj:\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 -YX -DNODEBUG $<\r
+!endif\r
+\r
+C_FILES= \\r
+       decode.c \\r
+       encode.c \\r
+       main.c\r
+\r
+OBJS= $(C_FILES:.c=.obj)\r
+\r
+all: flac.exe\r
+\r
+flac.exe: $(OBJS)\r
+       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib\r
+\r
+clean:\r
+       -del *.obj *.pch\r
+       -del ..\..\obj\bin\flac.exe\r

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index 5bccf54..914e7bc 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -1,31 +1,31 @@
-!include <win32.mak>
-
-!IFDEF DEBUG
-.c.obj:
-       $(cc) /D FLAC_OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<
-!else
-.c.obj:
-       $(cc) $(cdebug) $(cflags) /O2 /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<
-!endif
-
-C_FILES= \
-       bitbuffer.c \
-       crc.c \
-       encoder.c \
-       encoder_framing.c \
-       file_decoder.c \
-       fixed.c \
-       format.c \
-       lpc.c \
-       stream_decoder.c
-
-OBJS= $(C_FILES:.c=.obj)
-
-all: libFLAC.lib
-
-libFLAC.lib: $(OBJS)
-       link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)
-
-clean:
-       -del *.obj *.pch
-       -del ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\libFLAC.pdb
+!include <win32.mak>\r
+\r
+!IFDEF DEBUG\r
+.c.obj:\r
+       $(cc) /D FLAC_OVERFLOW_DETECT /GX $(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
+!endif\r
+\r
+C_FILES= \\r
+       bitbuffer.c \\r
+       crc.c \\r
+       encoder.c \\r
+       encoder_framing.c \\r
+       file_decoder.c \\r
+       fixed.c \\r
+       format.c \\r
+       lpc.c \\r
+       stream_decoder.c\r
+\r
+OBJS= $(C_FILES:.c=.obj)\r
+\r
+all: libFLAC.lib\r
+\r
+libFLAC.lib: $(OBJS)\r
+       link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)\r
+\r
+clean:\r
+       -del *.obj *.pch\r
+       -del ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\libFLAC.pdb\r

diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc
index 38a99ee..9364844 100644 (file)
--- a/src/plugin_winamp2/Makefile.vc
+++ b/src/plugin_winamp2/Makefile.vc
@@ -1,23 +1,23 @@
-!include <win32.mak>
-
-!IFNDEF NODEBUG
-.c.obj:
-       $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<
-!else
-.c.obj:
-       $(cc) $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<
-!endif
-
-C_FILES= \
-       in_flac.c
-
-OBJS= $(C_FILES:.c=.obj)
-
-all: in_flac.dll
-
-in_flac.dll: $(OBJS)
-       link.exe /dll /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.dll $(OBJS) libFLAC.lib user32.lib kernel32.lib
-
-clean:
-       -del *.obj *.pch
-       -del ..\..\obj\bin\in_flac.*
+!include <win32.mak>\r
+\r
+!IFDEF DEBUG\r
+.c.obj:\r
+       $(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
+!else\r
+.c.obj:\r
+       $(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<\r
+!endif\r
+\r
+C_FILES= \\r
+       in_flac.c\r
+\r
+OBJS= $(C_FILES:.c=.obj)\r
+\r
+all: in_flac.dll\r
+\r
+in_flac.dll: $(OBJS)\r
+       link.exe /dll /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.dll $(OBJS) libFLAC.lib user32.lib kernel32.lib\r
+\r
+clean:\r
+       -del *.obj *.pch\r
+       -del ..\..\obj\bin\in_flac.*\r