diff options
-rwxr-xr-x | win32/build_vorbis_dynamic.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbis_dynamic_debug.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbis_static.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbis_static_debug.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisenc_dynamic.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisenc_dynamic_debug.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisenc_static.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisenc_static_debug.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisfile_dynamic.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisfile_dynamic_debug.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisfile_static.bat | 2 | ||||
-rwxr-xr-x | win32/build_vorbisfile_static_debug.bat | 2 | ||||
-rw-r--r-- | win32/vorbis.def | 1 | ||||
-rw-r--r-- | win32/vorbis_dynamic.dsp | 16 | ||||
-rw-r--r-- | win32/vorbis_static.dsp | 14 | ||||
-rw-r--r-- | win32/vorbisenc_dynamic.dsp | 12 | ||||
-rw-r--r-- | win32/vorbisenc_static.dsp | 10 | ||||
-rw-r--r-- | win32/vorbisfile.def | 3 | ||||
-rw-r--r-- | win32/vorbisfile_dynamic.dsp | 12 | ||||
-rw-r--r-- | win32/vorbisfile_static.dsp | 10 |
20 files changed, 57 insertions, 45 deletions
diff --git a/win32/build_vorbis_dynamic.bat b/win32/build_vorbis_dynamic.bat index 1c1cae3f..5cea47d4 100755 --- a/win32/build_vorbis_dynamic.bat +++ b/win32/build_vorbis_dynamic.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbis (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbis_dynamic_debug.bat b/win32/build_vorbis_dynamic_debug.bat index 89090efa..822f2549 100755 --- a/win32/build_vorbis_dynamic_debug.bat +++ b/win32/build_vorbis_dynamic_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbis (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbis_static.bat b/win32/build_vorbis_static.bat index cb511967..f09c5587 100755 --- a/win32/build_vorbis_static.bat +++ b/win32/build_vorbis_static.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbis (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbis_static_debug.bat b/win32/build_vorbis_static_debug.bat index ae67e833..0e5425c7 100755 --- a/win32/build_vorbis_static_debug.bat +++ b/win32/build_vorbis_static_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbis (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisenc_dynamic.bat b/win32/build_vorbisenc_dynamic.bat index 47362f31..2538b1b8 100755 --- a/win32/build_vorbisenc_dynamic.bat +++ b/win32/build_vorbisenc_dynamic.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisenc (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisenc_dynamic_debug.bat b/win32/build_vorbisenc_dynamic_debug.bat index 68a913e8..4dd6547b 100755 --- a/win32/build_vorbisenc_dynamic_debug.bat +++ b/win32/build_vorbisenc_dynamic_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisenc (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisenc_static.bat b/win32/build_vorbisenc_static.bat index 9c13a481..21ce5ccd 100755 --- a/win32/build_vorbisenc_static.bat +++ b/win32/build_vorbisenc_static.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisenc (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisenc_static_debug.bat b/win32/build_vorbisenc_static_debug.bat index f794bf49..ef4c7cc4 100755 --- a/win32/build_vorbisenc_static_debug.bat +++ b/win32/build_vorbisenc_static_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisenc (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisfile_dynamic.bat b/win32/build_vorbisfile_dynamic.bat index d1e6c128..d3b8170d 100755 --- a/win32/build_vorbisfile_dynamic.bat +++ b/win32/build_vorbisfile_dynamic.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisfile (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisfile_dynamic_debug.bat b/win32/build_vorbisfile_dynamic_debug.bat index 1fe78e69..c3222522 100755 --- a/win32/build_vorbisfile_dynamic_debug.bat +++ b/win32/build_vorbisfile_dynamic_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisfile (Dynamic) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisfile_static.bat b/win32/build_vorbisfile_static.bat index adde94c5..1afda648 100755 --- a/win32/build_vorbisfile_static.bat +++ b/win32/build_vorbisfile_static.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisfile (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/build_vorbisfile_static_debug.bat b/win32/build_vorbisfile_static_debug.bat index aa5581d2..95fae898 100755 --- a/win32/build_vorbisfile_static_debug.bat +++ b/win32/build_vorbisfile_static_debug.bat @@ -1,7 +1,7 @@ @echo off echo ---+++--- Building Vorbisfile (Static) ---+++--- -if .%SRCROOT%==. set SRCROOT=c:\src +if .%SRCROOT%==. set SRCROOT=i:\xiph set OLDPATH=%PATH% set OLDINCLUDE=%INCLUDE% diff --git a/win32/vorbis.def b/win32/vorbis.def index 92dd40fe..dd072629 100644 --- a/win32/vorbis.def +++ b/win32/vorbis.def @@ -24,6 +24,7 @@ vorbis_synthesis vorbis_synthesis_blockin vorbis_synthesis_pcmout vorbis_synthesis_read +vorbis_packet_blocksize _vi_psy_copy _mapping_P _floor_P diff --git a/win32/vorbis_dynamic.dsp b/win32/vorbis_dynamic.dsp index 853efb50..cab4e060 100644 --- a/win32/vorbis_dynamic.dsp +++ b/win32/vorbis_dynamic.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Dynamic_Release" -# PROP Intermediate_Dir "Dynamic_Release" +# PROP Output_Dir "Vorbis_Dynamic_Release" +# PROP Intermediate_Dir "Vorbis_Dynamic_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c @@ -53,7 +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 /dll /machine:I386 -# ADD 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 ogg.lib /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" +# ADD 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 ogg.lib /nologo /dll /machine:I386 /out:"Vorbis_Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" !ELSEIF "$(CFG)" == "vorbis_dynamic - Win32 Debug" @@ -64,8 +64,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Dynamic_Debug" -# PROP Intermediate_Dir "Dynamic_Debug" +# PROP Output_Dir "Vorbis_Dynamic_Debug" +# PROP Intermediate_Dir "Vorbis_Dynamic_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c @@ -79,7 +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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 ogg.lib /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbis.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" +# ADD 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 ogg_d.lib /nologo /dll /debug /machine:I386 /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" !ENDIF @@ -116,6 +116,10 @@ SOURCE=..\lib\floor0.c # End Source File # Begin Source File +SOURCE=..\lib\floor1.c +# End Source File +# Begin Source File + SOURCE=..\lib\info.c # End Source File # Begin Source File diff --git a/win32/vorbis_static.dsp b/win32/vorbis_static.dsp index e7b760cd..26c1c941 100644 --- a/win32/vorbis_static.dsp +++ b/win32/vorbis_static.dsp @@ -37,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Static_Release" -# PROP Intermediate_Dir "Static_Release" +# PROP Output_Dir "Vorbis_Static_Release" +# PROP Intermediate_Dir "Vorbis_Static_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c @@ -60,8 +60,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Static_Debug" -# PROP Intermediate_Dir "Static_Debug" +# PROP Output_Dir "Vorbis_Static_Debug" +# PROP Intermediate_Dir "Vorbis_Static_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"Vorbis_Static_Debug\vorbis_static_d.lib" !ENDIF @@ -109,6 +109,10 @@ SOURCE=..\lib\floor0.c # End Source File # Begin Source File +SOURCE=..\lib\floor1.c +# End Source File +# Begin Source File + SOURCE=..\lib\info.c # End Source File # Begin Source File diff --git a/win32/vorbisenc_dynamic.dsp b/win32/vorbisenc_dynamic.dsp index 772f5b86..abc8eb05 100644 --- a/win32/vorbisenc_dynamic.dsp +++ b/win32/vorbisenc_dynamic.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Dynamic_Release" -# PROP Intermediate_Dir "Dynamic_Release" +# PROP Output_Dir "VorbisEnc_Dynamic_Release" +# PROP Intermediate_Dir "VorbisEnc_Dynamic_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /c @@ -53,7 +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 /dll /machine:I386 -# ADD 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 ogg.lib vorbis.lib /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release" +# ADD 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 ogg.lib vorbis.lib /nologo /dll /machine:I386 /out:"VorbisEnc_Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release" !ELSEIF "$(CFG)" == "vorbisenc_dynamic - Win32 Debug" @@ -64,8 +64,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Dynamic_Debug" -# PROP Intermediate_Dir "Dynamic_Debug" +# PROP Output_Dir "VorbisEnc_Dynamic_Debug" +# PROP Intermediate_Dir "VorbisEnc_Dynamic_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /GZ /c @@ -79,7 +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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 ogg.lib vorbis.lib /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisenc.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug" +# ADD 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 ogg_d.lib vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug" !ENDIF diff --git a/win32/vorbisenc_static.dsp b/win32/vorbisenc_static.dsp index 3ecf8079..1d98b141 100644 --- a/win32/vorbisenc_static.dsp +++ b/win32/vorbisenc_static.dsp @@ -37,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Static_Release" -# PROP Intermediate_Dir "Static_Release" +# PROP Output_Dir "VorbisEnc_Static_Release" +# PROP Intermediate_Dir "VorbisEnc_Static_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c @@ -60,8 +60,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Static_Debug" -# PROP Intermediate_Dir "Static_Debug" +# PROP Output_Dir "VorbisEnc_Static_Debug" +# PROP Intermediate_Dir "VorbisEnc_Static_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"VorbisEnc_Static_Debug\vorbisenc_static_d.lib" !ENDIF diff --git a/win32/vorbisfile.def b/win32/vorbisfile.def index 77e3106a..f9ffddcf 100644 --- a/win32/vorbisfile.def +++ b/win32/vorbisfile.def @@ -23,3 +23,6 @@ ov_time_tell ov_info ov_comment ov_read +ov_test +ov_test_callbacks +ov_test_open diff --git a/win32/vorbisfile_dynamic.dsp b/win32/vorbisfile_dynamic.dsp index dda8d594..75e0f6e0 100644 --- a/win32/vorbisfile_dynamic.dsp +++ b/win32/vorbisfile_dynamic.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Dynamic_Release" -# PROP Intermediate_Dir "Dynamic_Release" +# PROP Output_Dir "VorbisFile_Dynamic_Release" +# PROP Intermediate_Dir "VorbisFile_Dynamic_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /c @@ -53,7 +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 /dll /machine:I386 -# ADD 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 ogg.lib vorbis.lib /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release" +# ADD 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 ogg.lib vorbis.lib /nologo /dll /machine:I386 /out:"VorbisFile_Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release" !ELSEIF "$(CFG)" == "vorbisfile_dynamic - Win32 Debug" @@ -64,8 +64,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Dynamic_Debug" -# PROP Intermediate_Dir "Dynamic_Debug" +# PROP Output_Dir "VorbisFile_Dynamic_Debug" +# PROP Intermediate_Dir "VorbisFile_Dynamic_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /GZ /c @@ -79,7 +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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 ogg.lib vorbis.lib /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisfile.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug" +# ADD 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 ogg_d.lib vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisFile_Dynamic_Debug/vorbisfile_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug" !ENDIF diff --git a/win32/vorbisfile_static.dsp b/win32/vorbisfile_static.dsp index 87911b9c..62138967 100644 --- a/win32/vorbisfile_static.dsp +++ b/win32/vorbisfile_static.dsp @@ -37,8 +37,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Static_Release" -# PROP Intermediate_Dir "Static_Release" +# PROP Output_Dir "VorbisFile_Static_Release" +# PROP Intermediate_Dir "VorbisFile_Static_Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c @@ -60,8 +60,8 @@ LIB32=link.exe -lib # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Static_Debug" -# PROP Intermediate_Dir "Static_Debug" +# PROP Output_Dir "VorbisFile_Static_Debug" +# PROP Intermediate_Dir "VorbisFile_Static_Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"VorbisFile_Static_Debug\vorbisfile_static_d.lib" !ENDIF |