From 77123f181d1d5a497e872dab9305a5d6f8660af6 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 27 Nov 2002 05:35:13 +0000 Subject: [PATCH] minor fixes --- src/libOggFLAC/libOggFLAC_dynamic.dsp | 6 ++---- src/metaflac/metaflac.dsp | 20 ++++++++++++++++++++ src/plugin_common/dynamic.dsp | 6 ++---- src/plugin_winamp2/in_flac.dsp | 2 +- src/plugin_winamp3/cnv_flacpcm.dsp | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/libOggFLAC/libOggFLAC_dynamic.dsp b/src/libOggFLAC/libOggFLAC_dynamic.dsp index debb0abc..7632bdee 100644 --- a/src/libOggFLAC/libOggFLAC_dynamic.dsp +++ b/src/libOggFLAC/libOggFLAC_dynamic.dsp @@ -53,8 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\obj\release\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\release\bin/libOggFLAC.dll" -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 ..\..\obj\release\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libOggFLAC.dll" !ELSEIF "$(CFG)" == "libOggFLAC_dynamic - Win32 Debug" @@ -80,8 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\obj\debug\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\debug\bin/libOggFLAC.dll" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 ..\..\obj\debug\lib\libFLAC.lib ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libOggFLAC.dll" /pdbtype:sept !ENDIF diff --git a/src/metaflac/metaflac.dsp b/src/metaflac/metaflac.dsp index 300be7a9..4eec8ea4 100644 --- a/src/metaflac/metaflac.dsp +++ b/src/metaflac/metaflac.dsp @@ -97,6 +97,10 @@ SOURCE=.\operations.c # End Source File # Begin Source File +SOURCE=.\operations_shorthand_cuesheet.c +# End Source File +# Begin Source File + SOURCE=.\operations_shorthand_seektable.c # End Source File # Begin Source File @@ -123,6 +127,22 @@ SOURCE=.\utils.c # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\operations.h +# End Source File +# Begin Source File + +SOURCE=.\options.h +# End Source File +# Begin Source File + +SOURCE=.\usage.h +# End Source File +# Begin Source File + +SOURCE=.\utils.h +# End Source File # End Group # End Target # End Project diff --git a/src/plugin_common/dynamic.dsp b/src/plugin_common/dynamic.dsp index 97acf5cb..82a4b599 100644 --- a/src/plugin_common/dynamic.dsp +++ b/src/plugin_common/dynamic.dsp @@ -53,8 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/plugin_common.dll" -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/plugin_common.dll" !ELSEIF "$(CFG)" == "plugin_common - Win32 Debug" @@ -80,8 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/plugin_common.dll" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/plugin_common.dll" /pdbtype:sept !ENDIF diff --git a/src/plugin_winamp2/in_flac.dsp b/src/plugin_winamp2/in_flac.dsp index ace1acbc..624c6713 100644 --- a/src/plugin_winamp2/in_flac.dsp +++ b/src/plugin_winamp2/in_flac.dsp @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\obj\debug\lib\plugin_common_static.lib ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/debug/bin/in_flac.dll" /pdbtype:sept /libpath:"../../obj/debug/lib" +# ADD LINK32 ..\..\obj\debug\lib\plugin_common_static.lib ..\..\obj\debug\lib\grabbag_static.lib ..\..\obj\debug\lib\libFLAC_static.lib kernel32.lib user32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../obj/debug/bin/in_flac.dll" /pdbtype:sept /libpath:"../../obj/debug/lib" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/src/plugin_winamp3/cnv_flacpcm.dsp b/src/plugin_winamp3/cnv_flacpcm.dsp index 70231add..dfaa0d58 100644 --- a/src/plugin_winamp3/cnv_flacpcm.dsp +++ b/src/plugin_winamp3/cnv_flacpcm.dsp @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libFLAC.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib msacm32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"../../obj/bin/cnv_flacpcm.wac" /pdbtype:sept /libpath:"../../obj/lib" +# ADD LINK32 libFLAC.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib msacm32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../obj/bin/cnv_flacpcm.wac" /pdbtype:sept /libpath:"../../obj/lib" # SUBTRACT LINK32 /pdb:none !ENDIF