Mon Jun 18 08:03:47 PDT 2001

jack        01/06/18 08:03:47

  Modified:    win32    build_vorbis_dynamic.bat
                        build_vorbis_dynamic_debug.bat
                        build_vorbis_static.bat
                        build_vorbis_static_debug.bat
                        build_vorbisenc_dynamic.bat
                        build_vorbisenc_dynamic_debug.bat
                        build_vorbisenc_static.bat
                        build_vorbisenc_static_debug.bat
                        build_vorbisfile_dynamic.bat
                        build_vorbisfile_dynamic_debug.bat
                        build_vorbisfile_static.bat
                        build_vorbisfile_static_debug.bat vorbis.def
                        vorbis_dynamic.dsp vorbis_static.dsp
                        vorbisenc_dynamic.dsp vorbisenc_static.dsp
                        vorbisfile.def vorbisfile_dynamic.dsp
                        vorbisfile_static.dsp
  Log:
  win32 build fixes, including ingo's suggestions

Revision  Changes    Path
1.3       +1 -1      vorbis/win32/build_vorbis_dynamic.bat

Index: build_vorbis_dynamic.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbis_dynamic.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- build_vorbis_dynamic.bat	2000/11/05 20:04:04	1.2
+++ build_vorbis_dynamic.bat	2001/06/18 15:03:44	1.3
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbis_dynamic_debug.bat

Index: build_vorbis_dynamic_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbis_dynamic_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbis_dynamic_debug.bat	2000/11/05 20:04:04	1.1
+++ build_vorbis_dynamic_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.3       +1 -1      vorbis/win32/build_vorbis_static.bat

Index: build_vorbis_static.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbis_static.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build_vorbis_static.bat	2000/11/05 20:04:04	1.2
+++ build_vorbis_static.bat	2001/06/18 15:03:44	1.3
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbis_static_debug.bat

Index: build_vorbis_static_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbis_static_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbis_static_debug.bat	2000/11/05 20:04:04	1.1
+++ build_vorbis_static_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisenc_dynamic.bat

Index: build_vorbisenc_dynamic.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisenc_dynamic.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisenc_dynamic.bat	2000/11/06 09:48:26	1.1
+++ build_vorbisenc_dynamic.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisenc_dynamic_debug.bat

Index: build_vorbisenc_dynamic_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisenc_dynamic_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisenc_dynamic_debug.bat	2000/11/06 09:48:26	1.1
+++ build_vorbisenc_dynamic_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisenc_static.bat

Index: build_vorbisenc_static.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisenc_static.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisenc_static.bat	2000/11/06 09:48:26	1.1
+++ build_vorbisenc_static.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisenc_static_debug.bat

Index: build_vorbisenc_static_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisenc_static_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisenc_static_debug.bat	2000/11/06 09:48:26	1.1
+++ build_vorbisenc_static_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisfile_dynamic.bat

Index: build_vorbisfile_dynamic.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisfile_dynamic.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisfile_dynamic.bat	2000/11/06 09:31:43	1.1
+++ build_vorbisfile_dynamic.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisfile_dynamic_debug.bat

Index: build_vorbisfile_dynamic_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisfile_dynamic_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisfile_dynamic_debug.bat	2000/11/06 09:31:43	1.1
+++ build_vorbisfile_dynamic_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisfile_static.bat

Index: build_vorbisfile_static.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisfile_static.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisfile_static.bat	2000/11/06 09:31:43	1.1
+++ build_vorbisfile_static.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.2       +1 -1      vorbis/win32/build_vorbisfile_static_debug.bat

Index: build_vorbisfile_static_debug.bat
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/build_vorbisfile_static_debug.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_vorbisfile_static_debug.bat	2000/11/06 09:31:43	1.1
+++ build_vorbisfile_static_debug.bat	2001/06/18 15:03:44	1.2
@@ -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%

1.3       +1 -0      vorbis/win32/vorbis.def

Index: vorbis.def
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis.def	2000/11/06 09:48:26	1.2
+++ vorbis.def	2001/06/18 15:03:44	1.3
@@ -24,6 +24,7 @@
 vorbis_synthesis_blockin
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
+vorbis_packet_blocksize
 _vi_psy_copy
 _mapping_P
 _floor_P

1.4       +10 -6     vorbis/win32/vorbis_dynamic.dsp

Index: vorbis_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_dynamic.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vorbis_dynamic.dsp	2001/02/19 06:34:06	1.3
+++ vorbis_dynamic.dsp	2001/06/18 15:03:44	1.4
@@ -38,8 +38,8 @@
 # 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 @@
 # 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 @@
 # 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 @@
 # 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 
 
@@ -113,6 +113,10 @@
 # Begin Source File
 
 SOURCE=..\lib\floor0.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\floor1.c
 # End Source File
 # Begin Source File
 

1.3       +9 -5      vorbis/win32/vorbis_static.dsp

Index: vorbis_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_static.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis_static.dsp	2001/02/19 06:34:06	1.2
+++ vorbis_static.dsp	2001/06/18 15:03:44	1.3
@@ -37,8 +37,8 @@
 # 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 @@
 # 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 @@
 # 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 
 
@@ -106,6 +106,10 @@
 # Begin Source File
 
 SOURCE=..\lib\floor0.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\floor1.c
 # End Source File
 # Begin Source File
 

1.3       +6 -6      vorbis/win32/vorbisenc_dynamic.dsp

Index: vorbisenc_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_dynamic.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbisenc_dynamic.dsp	2001/02/19 06:34:06	1.2
+++ vorbisenc_dynamic.dsp	2001/06/18 15:03:44	1.3
@@ -38,8 +38,8 @@
 # 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 @@
 # 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 @@
 # 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 @@
 # 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 
 

1.2       +5 -5      vorbis/win32/vorbisenc_static.dsp

Index: vorbisenc_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_static.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisenc_static.dsp	2000/11/06 09:48:26	1.1
+++ vorbisenc_static.dsp	2001/06/18 15:03:44	1.2
@@ -37,8 +37,8 @@
 # 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 @@
 # 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 @@
 # 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 
 

1.2       +3 -0      vorbis/win32/vorbisfile.def

Index: vorbisfile.def
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisfile.def	2000/10/29 02:51:04	1.1
+++ vorbisfile.def	2001/06/18 15:03:44	1.2
@@ -23,3 +23,6 @@
 ov_info
 ov_comment
 ov_read
+ov_test
+ov_test_callbacks
+ov_test_open

1.3       +6 -6      vorbis/win32/vorbisfile_dynamic.dsp

Index: vorbisfile_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile_dynamic.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbisfile_dynamic.dsp	2001/02/19 06:34:06	1.2
+++ vorbisfile_dynamic.dsp	2001/06/18 15:03:44	1.3
@@ -38,8 +38,8 @@
 # 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 @@
 # 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 @@
 # 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 @@
 # 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 
 

1.2       +5 -5      vorbis/win32/vorbisfile_static.dsp

Index: vorbisfile_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile_static.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisfile_static.dsp	2000/11/06 09:31:43	1.1
+++ vorbisfile_static.dsp	2001/06/18 15:03:44	1.2
@@ -37,8 +37,8 @@
 # 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 @@
 # 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 @@
 # 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 
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.

