[xiph-cvs] cvs commit: win32sdk makesdk.bat
Jack Moffitt
jack at xiph.org
Sun Feb 18 22:34:08 PST 2001
jack 01/02/18 22:34:08
Modified: win32 ogg_static.dsp
lib bitbuffer.c
win32 vorbis_dynamic.dsp vorbis_static.dsp
vorbisenc_dynamic.dsp vorbisfile_dynamic.dsp
winamp winamp_plugin.dsp
. makesdk.bat
Added: winamp resource.h resource.rc
Log:
updated the win32 build system and corrected some missing files
Revision Changes Path
1.2 +18 -0 ogg/win32/ogg_static.dsp
Index: ogg_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/ogg/win32/ogg_static.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogg_static.dsp 2000/10/13 05:16:45 1.1
+++ ogg_static.dsp 2001/02/19 06:34:05 1.2
@@ -86,10 +86,28 @@
# Begin Source File
SOURCE=..\src\bitwise.c
+
+!IF "$(CFG)" == "ogg_static - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ogg_static - Win32 Debug"
+
+# ADD CPP /MDd
+
+!ENDIF
+
# End Source File
# Begin Source File
SOURCE=..\src\framing.c
+
+!IF "$(CFG)" == "ogg_static - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ogg_static - Win32 Debug"
+
+# ADD CPP /MDd
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +2 -1 vorbis/lib/bitbuffer.c
Index: bitbuffer.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitbuffer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bitbuffer.c 2001/02/02 03:51:55 1.3
+++ bitbuffer.c 2001/02/19 06:34:05 1.4
@@ -11,10 +11,11 @@
********************************************************************
function: flexible, delayed bitpacking abstraction
- last mod: $Id: bitbuffer.c,v 1.3 2001/02/02 03:51:55 xiphmont Exp $
+ last mod: $Id: bitbuffer.c,v 1.4 2001/02/19 06:34:05 jack Exp $
********************************************************************/
+#include <string.h>
#include <ogg/ogg.h>
#include <vorbis/codec.h>
#include "misc.h"
1.3 +12 -12 vorbis/win32/vorbis_dynamic.dsp
Index: vorbis_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_dynamic.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis_dynamic.dsp 2000/11/06 09:31:43 1.2
+++ vorbis_dynamic.dsp 2001/02/19 06:34:06 1.3
@@ -43,7 +43,7 @@
# 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
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -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"
+# 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"
!ELSEIF "$(CFG)" == "vorbis_dynamic - Win32 Debug"
@@ -69,7 +69,7 @@
# 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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
+# 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"
!ENDIF
@@ -96,6 +96,10 @@
# End Source File
# Begin Source File
+SOURCE=..\lib\bitbuffer.c
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\block.c
# End Source File
# Begin Source File
@@ -112,18 +116,10 @@
# End Source File
# Begin Source File
-SOURCE=..\lib\iir.c
-# End Source File
-# Begin Source File
-
SOURCE=..\lib\info.c
# End Source File
# Begin Source File
-SOURCE=..\lib\lookup.c
-# End Source File
-# Begin Source File
-
SOURCE=..\lib\lpc.c
# End Source File
# Begin Source File
@@ -177,6 +173,10 @@
# Begin Source File
SOURCE=..\lib\backends.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\bitbuffer.h
# End Source File
# Begin Source File
1.2 +14 -6 vorbis/win32/vorbis_static.dsp
Index: vorbis_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_static.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbis_static.dsp 2000/10/23 03:46:16 1.1
+++ vorbis_static.dsp 2001/02/19 06:34:06 1.2
@@ -63,8 +63,8 @@
# PROP Output_Dir "Static_Debug"
# PROP Intermediate_Dir "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
+# 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
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -89,6 +89,10 @@
# End Source File
# Begin Source File
+SOURCE=..\lib\bitbuffer.c
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\block.c
# End Source File
# Begin Source File
@@ -105,10 +109,6 @@
# End Source File
# Begin Source File
-SOURCE=..\lib\iir.c
-# End Source File
-# Begin Source File
-
SOURCE=..\lib\info.c
# End Source File
# Begin Source File
@@ -169,6 +169,10 @@
# End Source File
# Begin Source File
+SOURCE=..\lib\bitbuffer.h
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\bookinternal.h
# End Source File
# Begin Source File
@@ -210,6 +214,10 @@
# Begin Source File
SOURCE=..\lib\mdct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\misc.h
# End Source File
# Begin Source File
1.2 +4 -4 vorbis/win32/vorbisenc_dynamic.dsp
Index: vorbisenc_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_dynamic.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisenc_dynamic.dsp 2000/11/06 09:48:26 1.1
+++ vorbisenc_dynamic.dsp 2001/02/19 06:34:06 1.2
@@ -43,7 +43,7 @@
# 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
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -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:".\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:"Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release"
!ELSEIF "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
@@ -69,7 +69,7 @@
# 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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:".\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.lib vorbis.lib /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisenc.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug"
!ENDIF
1.2 +4 -4 vorbis/win32/vorbisfile_dynamic.dsp
Index: vorbisfile_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile_dynamic.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisfile_dynamic.dsp 2000/11/06 09:31:43 1.1
+++ vorbisfile_dynamic.dsp 2001/02/19 06:34:06 1.2
@@ -43,7 +43,7 @@
# 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
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -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:".\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:"Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release"
!ELSEIF "$(CFG)" == "vorbisfile_dynamic - Win32 Debug"
@@ -69,7 +69,7 @@
# 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISFILE_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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:".\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.lib vorbis.lib /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisfile.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug"
!ENDIF
1.3 +19 -2 vorbis-plugins/winamp/winamp_plugin.dsp
Index: winamp_plugin.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis-plugins/winamp/winamp_plugin.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- winamp_plugin.dsp 2000/11/06 20:57:18 1.2
+++ winamp_plugin.dsp 2001/02/19 06:34:07 1.3
@@ -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_static.lib vorbis_static.lib vorbisfile_static.lib /nologo /dll /machine:I386 /out:"Release\in_vorbis.dll" /libpath:"c:\src\ogg\win32\Static_Release" /libpath:"c:\src\vorbis\win32\Static_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_static.lib vorbis_static.lib vorbisfile_static.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release\in_vorbis.dll" /libpath:"c:\src\ogg\win32\Static_Release" /libpath:"c:\src\vorbis\win32\Static_Release"
!ELSEIF "$(CFG)" == "winamp_plugin - Win32 Debug"
@@ -79,7 +79,8 @@
# 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_static.lib vorbis_static.lib vorbisfile_static.lib /nologo /dll /debug /machine:I386 /out:"Debug\in_vorbis.dll" /pdbtype:sept /libpath:"c:\src\ogg\win32\Static_Debug" /libpath:"c:\src\vorbis\win32\Static_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_static.lib vorbis_static.lib vorbisfile_static.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug\in_vorbis.dll" /pdbtype:sept /libpath:"c:\src\ogg\win32\Static_Debug" /libpath:"c:\src\vorbis\win32\Static_Debug"
+# SUBTRACT LINK32 /nodefaultlib
!ENDIF
@@ -92,6 +93,10 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=.\httpstream.c
+# End Source File
+# Begin Source File
+
SOURCE=.\vorbis.c
# End Source File
# End Group
@@ -100,16 +105,28 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=.\httpstream.h
+# End Source File
+# Begin Source File
+
SOURCE=.\In2.h
# End Source File
# Begin Source File
SOURCE=.\Out.h
# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\resource.rc
+# End Source File
# End Group
# End Target
# End Project
1.2 +18 -0 vorbis-plugins/winamp/resource.h
1.2 +97 -0 vorbis-plugins/winamp/resource.rc
1.2 +44 -44 win32sdk/makesdk.bat
Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makesdk.bat 2000/11/06 09:55:00 1.1
+++ makesdk.bat 2001/02/19 06:34:07 1.2
@@ -5,7 +5,7 @@
rem --- prepare directory
-deltree /y sdk > nul
+rd /s /q sdk > nul
md sdk
md sdk\include
md sdk\include\ogg
@@ -47,8 +47,8 @@
echo Copying include files...
-xcopy32 %SRCROOT%\ogg\include\ogg\*.h %SRCROOT%\win32sdk\sdk\include\ogg > nul
-xcopy32 %SRCROOT%\vorbis\include\vorbis\*.h %SRCROOT%\win32sdk\sdk\include\vorbis > nul
+xcopy %SRCROOT%\ogg\include\ogg\*.h %SRCROOT%\win32sdk\sdk\include\ogg > nul
+xcopy %SRCROOT%\vorbis\include\vorbis\*.h %SRCROOT%\win32sdk\sdk\include\vorbis > nul
echo ... copied.
@@ -56,28 +56,28 @@
echo Building ogg...
cd %SRCROOT%\ogg\win32
-command /e:32768 /c build_ogg_static.bat > nul
+call build_ogg_static.bat > nul
echo ... static release built ...
-xcopy32 %SRCROOT%\ogg\win32\Static_Release\ogg_static.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\ogg\win32\Static_Release\ogg_static.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... static release copied ...
-command /e:32768 /c build_ogg_static_debug.bat > nul
+call build_ogg_static_debug.bat > nul
echo ... static debug built ...
-xcopy32 %SRCROOT%\ogg\win32\Static_Debug\ogg_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\ogg\win32\Static_Debug\ogg_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... static debug copied ...
-command /e:32768 /c build_ogg_dynamic.bat > nul
+call build_ogg_dynamic.bat > nul
echo ... dynamic release built ...
-xcopy32 %SRCROOT%\ogg\win32\Dynamic_Release\ogg.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\ogg\win32\Dynamic_Release\ogg.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\ogg\win32\Dynamic_Release\ogg.dll %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\ogg\win32\Dynamic_Release\ogg.dll %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... dynamic release copied ...
-command /e:32768 /c build_ogg_dynamic_debug.bat > nul
+call build_ogg_dynamic_debug.bat > nul
echo ... dynamic debug built ...
-xcopy32 %SRCROOT%\ogg\win32\Dynamic_Debug\ogg.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\ogg\win32\Dynamic_Debug\ogg.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\ogg\win32\Dynamic_Debug\ogg.dll %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\ogg\win32\Dynamic_Debug\ogg.dll %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... dynamic debug copied ...
echo ... ogg building done.
@@ -86,28 +86,28 @@
echo Building vorbis...
cd %SRCROOT%\vorbis\win32
-command /e:32768 /c build_vorbis_static.bat > nul
+call build_vorbis_static.bat > nul
echo ... static release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Release\vorbis_static.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Release\vorbis_static.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... static release copied ...
-command /e:32768 /c build_vorbis_static_debug.bat > nul
+call build_vorbis_static_debug.bat > nul
echo ... static debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Debug\vorbis_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Debug\vorbis_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... static debug copied ...
-command /e:32768 /c build_vorbis_dynamic.bat > nul
+call build_vorbis_dynamic.bat > nul
echo ... dynamic release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbis.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbis.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbis.dll %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbis.dll %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... dynamic release copied ...
-command /e:32768 /c build_vorbis_dynamic_debug.bat > nul
+call build_vorbis_dynamic_debug.bat > nul
echo ... dynamic debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbis.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbis.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbis.dll %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbis.dll %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... dynamic debug copied ...
echo ... vorbis building done.
@@ -116,28 +116,28 @@
echo Building vorbisfile...
cd %SRCROOT%\vorbis\win32
-command /e:32768 /c build_vorbisfile_static.bat > nul
+call build_vorbisfile_static.bat > nul
echo ... static release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Release\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Release\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... static release copied ...
-command /e:32768 /c build_vorbisfile_static_debug.bat > nul
+call build_vorbisfile_static_debug.bat > nul
echo ... static debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Debug\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Debug\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... static debug copied ...
-command /e:32768 /c build_vorbisfile_dynamic.bat > nul
+call build_vorbisfile_dynamic.bat > nul
echo ... dynamic release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisfile.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisfile.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisfile.dll %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisfile.dll %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... dynamic release copied ...
-command /e:32768 /c build_vorbisfile_dynamic_debug.bat > nul
+call build_vorbisfile_dynamic_debug.bat > nul
echo ... dynamic debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisfile.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisfile.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisfile.dll %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisfile.dll %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... dynamic debug copied ...
echo ... vorbisfile building done.
@@ -146,28 +146,28 @@
echo Building vorbisenc...
cd %SRCROOT%\vorbis\win32
-command /e:32768 /c build_vorbisenc_static.bat > nul
+call build_vorbisenc_static.bat > nul
echo ... static release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Release\vorbisenc_static.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Release\vorbisenc_static.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... static release copied ...
-command /e:32768 /c build_vorbisenc_static_debug.bat > nul
+call build_vorbisenc_static_debug.bat > nul
echo ... static debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Static_Debug\vorbisenc_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Static_Debug\vorbisenc_static.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... static debug copied ...
-command /e:32768 /c build_vorbisenc_dynamic.bat > nul
+call build_vorbisenc_dynamic.bat > nul
echo ... dynamic release built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisenc.lib %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisenc.lib %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisenc.dll %SRCROOT%\win32sdk\sdk\release > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Release\vorbisenc.dll %SRCROOT%\win32sdk\sdk\release > nul
if errorlevel 1 goto ERROR
echo ... dynamic release copied ...
-command /e:32768 /c build_vorbisenc_dynamic_debug.bat > nul
+call build_vorbisenc_dynamic_debug.bat > nul
echo ... dynamic debug built ...
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisenc.lib %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisenc.lib %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
-xcopy32 %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisenc.dll %SRCROOT%\win32sdk\sdk\debug > nul
+xcopy %SRCROOT%\vorbis\win32\Dynamic_Debug\vorbisenc.dll %SRCROOT%\win32sdk\sdk\debug > nul
if errorlevel 1 goto ERROR
echo ... dynamic debug copied ...
echo ... vorbisenc building done.
@@ -178,7 +178,7 @@
:ERROR
cd %SRCROOT%\win32sdk
-deltree /y sdk > nul
+rd /s /q sdk > nul
echo.
echo Some error(s) occurred. Fix it.
goto EXIT
--- >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.
More information about the commits
mailing list