From fcc7a6884d0f2593a28526a2f57173c8ba33eadd Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 22 Nov 2002 07:50:26 +0000 Subject: [PATCH] get Makefile.vc system working again with new debug/release dirs and static/dynamic targets --- src/flac/Makefile.vc | 4 ++-- src/libFLAC++/Makefile.vc | 8 ++++---- src/libFLAC/Makefile.vc | 8 ++++---- src/libOggFLAC++/Makefile.vc | 8 ++++---- src/libOggFLAC/Makefile.vc | 8 ++++---- src/metaflac/Makefile.vc | 4 ++-- src/plugin_common/Makefile.vc | 12 ++++++------ src/plugin_winamp2/Makefile.vc | 4 ++-- src/share/gain_analysis/Makefile.vc | 8 ++++---- src/share/getopt/Makefile.vc | 8 ++++---- src/share/grabbag/Makefile.vc | 12 ++++++------ src/share/utf8/Makefile.vc | 8 ++++---- src/test_grabbag/cuesheet/Makefile.vc | 4 ++-- src/test_libFLAC++/Makefile.vc | 4 ++-- src/test_libFLAC/Makefile.vc | 4 ++-- src/test_libOggFLAC++/Makefile.vc | 4 ++-- src/test_libOggFLAC/Makefile.vc | 4 ++-- src/test_streams/Makefile.vc | 4 ++-- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc index 4b0ec70f..9c870771 100644 --- a/src/flac/Makefile.vc +++ b/src/flac/Makefile.vc @@ -39,8 +39,8 @@ OBJS= $(C_FILES:.c=.obj) all: flac.exe flac.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) grabbag.lib libOggFLAC.lib libFLAC.lib ogg_static.lib gain_analysis.lib getopt.lib utf8.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib gain_analysis_static.lib getopt_static.lib utf8_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\flac.exe + -del ..\..\obj\release\bin\flac.exe diff --git a/src/libFLAC++/Makefile.vc b/src/libFLAC++/Makefile.vc index b555f9b6..32129344 100644 --- a/src/libFLAC++/Makefile.vc +++ b/src/libFLAC++/Makefile.vc @@ -39,11 +39,11 @@ CPP_FILES= \ OBJS= $(CPP_FILES:.cpp=.obj) -all: libFLAC++.lib +all: libFLAC++_static.lib -libFLAC++.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) +libFLAC++_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC++.pdb + -del ..\..\obj\release\lib\libFLAC++_static.lib ..\..\obj\release\lib\libFLAC++_static.pdb diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc index 04dcacb5..7e8e4a26 100644 --- a/src/libFLAC/Makefile.vc +++ b/src/libFLAC/Makefile.vc @@ -55,14 +55,14 @@ NASM_FILES= \ OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj) -all: ordinals libFLAC.lib +all: ordinals libFLAC_static.lib ordinals: ../../include/FLAC/ordinals.h ../../include/FLAC/ordinals.h: ../../include/FLAC/ordinals.h.in sed -e 's/@FLaC__SIZE16@/short/g' -e 's/@FLaC__SIZE32@/int/g' -e 's/@FLaC__SIZE64@/long long/g' -e 's/@FLaC__USIZE16@/unsigned short/g' -e 's/@FLaC__USIZE32@/unsigned int/g' -e 's/@FLaC__USIZE64@/unsigned long long/g' ../../include/FLAC/ordinals.h.in > ../../include/FLAC/ordinals.h -libFLAC.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) +libFLAC_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../obj/release/lib/$*.lib $(OBJS) ia32/cpu_asm.obj: ia32/cpu_asm.nasm $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj @@ -73,4 +73,4 @@ ia32/lpc_asm.obj: ia32/lpc_asm.nasm clean: -del *.obj ia32\*.obj *.pch - -del ..\..\obj\lib\libFLAC.lib ..\..\obj\lib\libFLAC.pdb + -del ..\..\obj\release\lib\libFLAC_static.lib ..\..\obj\release\lib\libFLAC_static.pdb diff --git a/src/libOggFLAC++/Makefile.vc b/src/libOggFLAC++/Makefile.vc index 3d466a35..0354c812 100644 --- a/src/libOggFLAC++/Makefile.vc +++ b/src/libOggFLAC++/Makefile.vc @@ -34,11 +34,11 @@ CPP_FILES= \ OBJS= $(CPP_FILES:.cpp=.obj) -all: libOggFLAC++.lib +all: libOggFLAC++_static.lib -libOggFLAC++.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) +libOggFLAC++_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\lib\libOggFLAC++.lib ..\..\obj\lib\libOggFLAC++.pdb + -del ..\..\obj\release\lib\libOggFLAC++_static.lib ..\..\obj\release\lib\libOggFLAC++_static.pdb diff --git a/src/libOggFLAC/Makefile.vc b/src/libOggFLAC/Makefile.vc index 4df2d463..f5f46b36 100644 --- a/src/libOggFLAC/Makefile.vc +++ b/src/libOggFLAC/Makefile.vc @@ -32,11 +32,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: libOggFLAC.lib +all: libOggFLAC_static.lib -libOggFLAC.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) +libOggFLAC_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\lib\libOggFLAC.lib ..\..\obj\lib\libOggFLAC.pdb + -del ..\..\obj\release\lib\libOggFLAC_static.lib ..\..\obj\release\lib\libOggFLAC_static.pdb diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc index 975c35b7..6d5060c1 100644 --- a/src/metaflac/Makefile.vc +++ b/src/metaflac/Makefile.vc @@ -40,8 +40,8 @@ OBJS= $(C_FILES:.c=.obj) all: metaflac.exe metaflac.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) grabbag.lib libFLAC.lib gain_analysis.lib getopt.lib utf8.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib gain_analysis_static.lib getopt_static.lib utf8_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\metaflac.exe + -del ..\..\obj\release\bin\metaflac.exe diff --git a/src/plugin_common/Makefile.vc b/src/plugin_common/Makefile.vc index 93070ed4..dc081c80 100644 --- a/src/plugin_common/Makefile.vc +++ b/src/plugin_common/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DFLAC__NO_DLL -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DFLAC__NO_DLL -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ @@ -19,11 +19,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: plugin_common.lib +all: plugin_common_static.lib -plugin_common.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS) +plugin_common_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\lib\plugin_common.lib ..\..\obj\lib\plugin_common.pdb + -del ..\..\obj\release\lib\plugin_common_static.lib ..\..\obj\release\lib\plugin_common_static.pdb diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc index f3527f6b..1865be7f 100644 --- a/src/plugin_winamp2/Makefile.vc +++ b/src/plugin_winamp2/Makefile.vc @@ -33,8 +33,8 @@ OBJS= $(C_FILES:.c=.obj) all: in_flac.dll in_flac.dll: $(OBJS) - link.exe /dll /nodefaultlib:libc.lib /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.dll $(OBJS) libFLAC.lib plugin_common.lib user32.lib kernel32.lib + link.exe /dll /nodefaultlib:libc.lib /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.dll $(OBJS) libFLAC_static.lib plugin_common_static.lib user32.lib kernel32.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\in_flac.* + -del ..\..\obj\release\bin\in_flac.* diff --git a/src/share/gain_analysis/Makefile.vc b/src/share/gain_analysis/Makefile.vc index 5b9e4b37..4080e11e 100644 --- a/src/share/gain_analysis/Makefile.vc +++ b/src/share/gain_analysis/Makefile.vc @@ -13,11 +13,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: gain_analysis.lib +all: gain_analysis_static.lib -gain_analysis.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(OBJS) +gain_analysis_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\..\obj\lib\gain_analysis.lib ..\..\..\obj\lib\gain_analysis.pdb + -del ..\..\..\obj\release\lib\gain_analysis_static.lib ..\..\..\obj\release\lib\gain_analysis_static.pdb diff --git a/src/share/getopt/Makefile.vc b/src/share/getopt/Makefile.vc index a6f09584..2f44ecd4 100644 --- a/src/share/getopt/Makefile.vc +++ b/src/share/getopt/Makefile.vc @@ -14,11 +14,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: getopt.lib +all: getopt_static.lib -getopt.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(OBJS) +getopt_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\..\obj\lib\getopt.lib ..\..\..\obj\lib\getopt.pdb + -del ..\..\..\obj\release\lib\getopt_static.lib ..\..\..\obj\release\lib\getopt_static.pdb diff --git a/src/share/grabbag/Makefile.vc b/src/share/grabbag/Makefile.vc index e0c4a4a3..0c525feb 100644 --- a/src/share/grabbag/Makefile.vc +++ b/src/share/grabbag/Makefile.vc @@ -2,10 +2,10 @@ !IFDEF DEBUG .c.obj: - $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $< + $(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\..\include" -DFLAC__NO_DLL -DSTRICT -YX /Od /D "_DEBUG" $< !else .c.obj: - $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include" -DSTRICT -YX -DNODEBUG $< + $(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\..\include" -DFLAC__NO_DLL -DSTRICT -YX -DNODEBUG $< !endif C_FILES= \ @@ -16,11 +16,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: grabbag.lib +all: grabbag_static.lib -grabbag.lib: $(OBJS) - link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(OBJS) +grabbag_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\..\obj\lib\grabbag.lib ..\..\..\obj\lib\grabbag.pdb + -del ..\..\..\obj\release\lib\grabbag_static.lib ..\..\..\obj\release\lib\grabbag_static.pdb diff --git a/src/share/utf8/Makefile.vc b/src/share/utf8/Makefile.vc index fb9e6ce0..ef12db84 100644 --- a/src/share/utf8/Makefile.vc +++ b/src/share/utf8/Makefile.vc @@ -15,11 +15,11 @@ C_FILES= \ OBJS= $(C_FILES:.c=.obj) -all: utf8.lib +all: utf8_static.lib -utf8.lib: $(UTF8_OBJS) - link.exe -lib /nodefaultlib -out:../../../obj/lib/$*.lib $(UTF8_OBJS) +utf8_static.lib: $(OBJS) + link.exe -lib /nodefaultlib -out:../../../obj/release/lib/$*.lib $(OBJS) clean: -del *.obj *.pch - -del ..\..\..\obj\lib\utf8.lib ..\..\..\obj\lib\utf8.pdb + -del ..\..\..\obj\release\lib\utf8_static.lib ..\..\..\obj\release\lib\utf8_static.pdb diff --git a/src/test_grabbag/cuesheet/Makefile.vc b/src/test_grabbag/cuesheet/Makefile.vc index b54dd8f7..0cb7b93e 100644 --- a/src/test_grabbag/cuesheet/Makefile.vc +++ b/src/test_grabbag/cuesheet/Makefile.vc @@ -33,8 +33,8 @@ OBJS= $(C_FILES:.c=.obj) all: test_cuesheet.exe test_cuesheet.exe: $(OBJS) - link.exe /libpath:"..\..\..\obj\debug\lib" -out:../../../obj/debug/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib + link.exe /libpath:"..\..\..\obj\release\lib" -out:../../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib clean: -del *.obj *.pch - -del ..\..\..\obj\debug\bin\test_cuesheet.exe + -del ..\..\..\obj\release\bin\test_cuesheet.exe diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc index 80edb315..e19924ac 100644 --- a/src/test_libFLAC++/Makefile.vc +++ b/src/test_libFLAC++/Makefile.vc @@ -52,8 +52,8 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libFLAC++.exe test_libFLAC++.exe: $(C_OBJS) $(CPP_OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag.lib libFLAC++.lib libFLAC.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib libFLAC++_static.lib libFLAC_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\test_libFLAC++.exe + -del ..\..\obj\release\bin\test_libFLAC++.exe diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc index 955ef92d..b37df36e 100644 --- a/src/test_libFLAC/Makefile.vc +++ b/src/test_libFLAC/Makefile.vc @@ -41,8 +41,8 @@ OBJS= $(C_FILES:.c=.obj) all: test_libFLAC.exe test_libFLAC.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) grabbag.lib libFLAC.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libFLAC_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\test_libFLAC.exe + -del ..\..\obj\release\bin\test_libFLAC.exe diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc index fd77a45a..aaf67923 100644 --- a/src/test_libOggFLAC++/Makefile.vc +++ b/src/test_libOggFLAC++/Makefile.vc @@ -49,8 +49,8 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libOggFLAC++.exe test_libOggFLAC++.exe: $(C_OBJS) $(CPP_OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) file_utils.lib libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(CPP_OBJS) $(C_OBJS) grabbag_static.lib libOggFLAC++_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\test_libOggFLAC++.exe + -del ..\..\obj\release\bin\test_libOggFLAC++.exe diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc index b363cfb0..f7c7ebac 100644 --- a/src/test_libOggFLAC/Makefile.vc +++ b/src/test_libOggFLAC/Makefile.vc @@ -37,8 +37,8 @@ OBJS= $(C_FILES:.c=.obj) all: test_libOggFLAC.exe test_libOggFLAC.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) file_utils.lib libOggFLAC.lib libFLAC.lib ogg_static.lib + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) grabbag_static.lib libOggFLAC_static.lib libFLAC_static.lib ogg_static.lib clean: -del *.obj *.pch - -del ..\..\obj\bin\test_libOggFLAC.exe + -del ..\..\obj\release\bin\test_libOggFLAC.exe diff --git a/src/test_streams/Makefile.vc b/src/test_streams/Makefile.vc index 9aba7b43..614b3f1f 100644 --- a/src/test_streams/Makefile.vc +++ b/src/test_streams/Makefile.vc @@ -33,8 +33,8 @@ OBJS= $(C_FILES:.c=.obj) all: test_streams.exe test_streams.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) + link.exe /libpath:"..\..\obj\release\lib" -out:../../obj/release/bin/$*.exe $(OBJS) clean: -del *.obj *.pch - -del ..\..\obj\bin\test_streams.exe + -del ..\..\obj\release\bin\test_streams.exe