minor fixes

diff --git a/src/libOggFLAC/libOggFLAC_dynamic.dsp b/src/libOggFLAC/libOggFLAC_dynamic.dsp
index debb0abc7bef578e33c7a75f5fee120726068661..7632bdeeb9937a1bbfc0ce57deb037a4a4d5ca9b 100644 (file)
--- a/src/libOggFLAC/libOggFLAC_dynamic.dsp
+++ b/src/libOggFLAC/libOggFLAC_dynamic.dsp
@@ -53,8 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
-# SUBTRACT LINK32 /nodefaultlib\r
+# 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"\r
 \r
 !ELSEIF  "$(CFG)" == "libOggFLAC_dynamic - Win32 Debug"\r
 \r
@@ -80,8 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
-# SUBTRACT LINK32 /nodefaultlib\r
+# 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\r
 \r
 !ENDIF \r
 \r

diff --git a/src/metaflac/metaflac.dsp b/src/metaflac/metaflac.dsp
index 300be7a9064dd39c3398fb8f9a8a264c3492198a..4eec8ea4d6154f409a8f9c481770dde3bffb1377 100644 (file)
--- a/src/metaflac/metaflac.dsp
+++ b/src/metaflac/metaflac.dsp
@@ -97,6 +97,10 @@ SOURCE=.\operations.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\operations_shorthand_cuesheet.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\operations_shorthand_seektable.c\r
 # End Source File\r
 # Begin Source File\r
@@ -123,6 +127,22 @@ SOURCE=.\utils.c
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\operations.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\options.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\usage.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\utils.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/src/plugin_common/dynamic.dsp b/src/plugin_common/dynamic.dsp
index 97acf5cb225d8b14f952115db8904893b62ed5b2..82a4b5997dd9666a346dd1b85eb5868f962a5b40 100644 (file)
--- a/src/plugin_common/dynamic.dsp
+++ b/src/plugin_common/dynamic.dsp
@@ -53,8 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/plugin_common.dll"\r
-# SUBTRACT LINK32 /nodefaultlib\r
+# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/plugin_common.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_common - Win32 Debug"\r
 \r
@@ -80,8 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"..\..\obj\bin/plugin_common.dll" /pdbtype:sept\r
-# SUBTRACT LINK32 /nodefaultlib\r
+# ADD LINK32 ..\..\obj\lib\libFLAC.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/plugin_common.dll" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r

diff --git a/src/plugin_winamp2/in_flac.dsp b/src/plugin_winamp2/in_flac.dsp
index ace1acbcf8ab4a1ef53e0708268ae548503c793c..624c6713b115ff393eb36851069915d2c1e63e6b 100644 (file)
--- a/src/plugin_winamp2/in_flac.dsp
+++ b/src/plugin_winamp2/in_flac.dsp
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/src/plugin_winamp3/cnv_flacpcm.dsp b/src/plugin_winamp3/cnv_flacpcm.dsp
index 70231addf27f88b087c58271e2723c61780ee991..dfaa0d584f371856a284fb3bcd6ef757a6d199da 100644 (file)
--- a/src/plugin_winamp3/cnv_flacpcm.dsp
+++ b/src/plugin_winamp3/cnv_flacpcm.dsp
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r