[vorbis-dev] win32sdk-1.0.1
Dimitry Andric
dimitry at andric.com
Sat Oct 25 10:47:24 PDT 2003
On 2003-10-24 at 00:02:09 Jack Moffitt wrote:
> This has all been fixed in CVS. I'd appreciate it if you would
> confirm this.
With the VC6 project files currently (checked out 2003-10-25 18:00:05
CEST) in the CVS trunk:
name linked with
-------------------------- -----------------------------------------
ogg_dynamic debug dynamic debug runtime (DLL)
ogg_static debug static debug runtime (multithreaded)
vorbis_dynamic debug dynamic debug runtime (DLL)
vorbis_static debug dynamic debug runtime (DLL)
vorbisenc_dynamic debug dynamic debug runtime (DLL)
vorbisenc_static debug dynamic debug runtime (DLL)
vorbisfile_dynamic debug dynamic debug runtime (DLL)
vorbisfile_static debug static debug runtime (multithreaded)
ogg_dynamic release dynamic runtime (DLL)
ogg_static release static runtime (multithreaded)
vorbis_dynamic release dynamic runtime (DLL)
vorbis_static release static runtime (multithreaded)
vorbisenc_dynamic release dynamic runtime (DLL)
vorbisenc_static release static runtime (multithreaded)
vorbisfile_dynamic release dynamic runtime (DLL)
vorbisfile_static release static runtime (multithreaded)
So it's still not very consistent, at least not with the debug
versions. ;) Also, I thought the intention was to have everything
linked with the static runtime? I agree that this will hopefully give
the least problems.
I've edited the project files to have all subprojects use the static
multithreaded runtime libraries, and also some other modifications.
Patches for the dsp files are attached, please review them.
Please be warned that it seems that the dsw files are currently
checked into the repository with incorrect linefeeds, so the patches
may not apply cleanly until these are fixed. It's probably best to
check them in from a Win32 system, with WinCVS or something like that.
-------------- next part --------------
Changes:
- Changed output paths from "Dynamic_Release" and "Static_Release" to
"Ogg_Dynamic_Release" and "Ogg_Static_Release", to be more consistent with
the other subprojects.
- Changed to static multithreading runtime libraries.
- Changed to normal Program Database for debug version, edit and continue will
almost never be needed by users of these projects.
- Lowered warning level to 1. This prevents an enormous amount of (in this
case) useless warnings about double -> int and similar conversions, which
are only likely to confuse users of these libraries.
- Moved .def file to the Source Files folder, since that is where it belongs
(check out the properties of the Source Files folder).
- Removed empty folders.
Index: win32/ogg_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/ogg/win32/ogg_dynamic.dsp,v
retrieving revision 1.7
diff -u -d -r1.7 ogg_dynamic.dsp
--- win32/ogg_dynamic.dsp 25 Oct 2003 12:12:23 -0000 1.7
+++ win32/ogg_dynamic.dsp 25 Oct 2003 17:16:54 -0000
@@ -38,12 +38,12 @@
# 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 "Ogg_Dynamic_Release"
+# PROP Intermediate_Dir "Ogg_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 "OGG_DYNAMIC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob1 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MT /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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=xilink6.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 /nologo /dll /machine:I386 /out:"Dynamic_Release/ogg.dll"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Ogg_Dynamic_Release/ogg.dll"
!ELSEIF "$(CFG)" == "ogg_dynamic - Win32 Debug"
@@ -64,13 +64,12 @@
# 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 "Ogg_Dynamic_Debug"
+# PROP Intermediate_Dir "Ogg_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 "OGG_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" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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"
@@ -80,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/ogg_d.dll" /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Ogg_Dynamic_Debug/ogg_d.dll"
!ENDIF
@@ -99,6 +98,10 @@
SOURCE=..\src\framing.c
# End Source File
+# Begin Source File
+
+SOURCE=.\ogg.def
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -112,17 +115,5 @@
SOURCE=..\include\ogg\os_types.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"
-# End Group
-# Begin Group "Other Files"
-
-# PROP Default_Filter ".def"
-# Begin Source File
-
-SOURCE=.\ogg.def
-# End Source File
-# End Group
# End Target
# End Project
Index: win32/ogg_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/ogg/win32/ogg_static.dsp,v
retrieving revision 1.10
diff -u -d -r1.10 ogg_static.dsp
--- win32/ogg_static.dsp 25 Oct 2003 12:12:23 -0000 1.10
+++ win32/ogg_static.dsp 25 Oct 2003 17:16:54 -0000
@@ -37,11 +37,11 @@
# 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 "Ogg_Static_Release"
+# PROP Intermediate_Dir "Ogg_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 /MT /W3 /GX /O2 /Ob1 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -60,11 +60,11 @@
# 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 "Ogg_Static_Debug"
+# PROP Intermediate_Dir "Ogg_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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -72,7 +72,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Static_Debug\ogg_static_d.lib"
+# ADD LIB32 /nologo /out:"Ogg_Static_Debug\ogg_static_d.lib"
!ENDIF
-------------- next part --------------
Changes:
- Added dependencies to vorbis.dsw workspace.
- Changed to static multithreading runtime libraries.
- Changed to normal Program Database for debug version, edit and continue will
almost never be needed by users of these projects.
- Lowered warning level to 1. This prevents an enormous amount of (in this case)
useless warnings about double -> int and similar conversions, which are only
likely to confuse users of these libraries.
- Moved .def file to the Source Files folder, since that is where it belongs
(check out the properties of the Source Files folder).
- Removed empty folders.
- Made all include paths the same (only ../../ogg/include and ../include are
needed).
- Removed intel compiler specific options.
Index: win32/vorbis.dsw
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis.dsw,v
retrieving revision 1.2
diff -u -d -r1.2 vorbis.dsw
--- win32/vorbis.dsw 25 Oct 2003 12:09:04 -0000 1.2
+++ win32/vorbis.dsw 25 Oct 2003 17:34:34 -0000
@@ -3,6 +3,30 @@
###############################################################################
+Project: "ogg_dynamic"=..\..\ogg\win32\ogg_dynamic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ogg_static"=..\..\ogg\win32\ogg_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "vorbis_dynamic"=.\vorbis_dynamic.dsp - Package Owner=<4>
Package=<5>
@@ -11,6 +35,9 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name ogg_dynamic
+ End Project Dependency
}}}
###############################################################################
@@ -35,6 +62,9 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name vorbis_dynamic
+ End Project Dependency
}}}
###############################################################################
@@ -59,6 +89,12 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name ogg_dynamic
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name vorbis_dynamic
+ End Project Dependency
}}}
###############################################################################
Index: win32/vorbis_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_dynamic.dsp,v
retrieving revision 1.16
diff -u -d -r1.16 vorbis_dynamic.dsp
--- win32/vorbis_dynamic.dsp 25 Oct 2003 12:09:05 -0000 1.16
+++ win32/vorbis_dynamic.dsp 25 Oct 2003 17:34:34 -0000
@@ -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 /GB /MD /W3 /GX /O2 /Ob1 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_IEEE_FLOAT32" /D "_USE_NON_INTEL_COMPILER" /YX /FD /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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=xilink6.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:"Vorbis_Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Vorbis_Dynamic_Release/vorbis.dll"
!ELSEIF "$(CFG)" == "vorbis_dynamic - Win32 Debug"
@@ -69,8 +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 "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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"
@@ -80,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbis.def" /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Vorbis_Dynamic_Debug/vorbis_d.dll"
# SUBTRACT LINK32 /verbose /pdb:none
!ENDIF
@@ -170,6 +169,10 @@
# End Source File
# Begin Source File
+SOURCE=.\vorbis.def
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\window.c
# End Source File
# End Group
@@ -182,10 +185,6 @@
# End Source File
# Begin Source File
-SOURCE=..\lib\bitbuffer.h
-# End Source File
-# Begin Source File
-
SOURCE=..\lib\bitrate.h
# End Source File
# Begin Source File
@@ -238,10 +237,18 @@
# End Source File
# Begin Source File
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\os.h
# End Source File
# Begin Source File
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\psy.h
# End Source File
# Begin Source File
@@ -261,17 +268,5 @@
SOURCE=..\lib\window.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"
-# End Group
-# Begin Group "Other Files"
-
-# PROP Default_Filter ".def"
-# Begin Source File
-
-SOURCE=.\vorbis.def
-# End Source File
-# End Group
# End Target
# End Project
Index: win32/vorbis_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_static.dsp,v
retrieving revision 1.12
diff -u -d -r1.12 vorbis_static.dsp
--- win32/vorbis_static.dsp 25 Oct 2003 12:09:05 -0000 1.12
+++ win32/vorbis_static.dsp 25 Oct 2003 17:34:34 -0000
@@ -41,7 +41,7 @@
# 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 /GB /MT /W3 /GX /O2 /Ob1 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /O3 /QaxK /Qsox- /Qip /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# 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" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -169,11 +169,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\include\vorbis\backends.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bitbuffer.h
+SOURCE=..\lib\backends.h
# End Source File
# Begin Source File
@@ -181,7 +177,7 @@
# End Source File
# Begin Source File
-SOURCE=..\include\vorbis\codebook.h
+SOURCE=..\lib\codebook.h
# End Source File
# Begin Source File
@@ -229,10 +225,18 @@
# End Source File
# Begin Source File
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\os.h
# End Source File
# Begin Source File
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
SOURCE=..\lib\psy.h
# End Source File
# Begin Source File
Index: win32/vorbisenc_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_dynamic.dsp,v
retrieving revision 1.13
diff -u -d -r1.13 vorbisenc_dynamic.dsp
--- win32/vorbisenc_dynamic.dsp 25 Oct 2003 12:09:05 -0000 1.13
+++ win32/vorbisenc_dynamic.dsp 25 Oct 2003 17:34:34 -0000
@@ -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 /GB /MD /W3 /GX /O2 /Ob1 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /YX /FD /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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=xilink6.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:"VorbisEnc_Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"VorbisEnc_Dynamic_Release/vorbisenc.dll"
!ELSEIF "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
@@ -69,8 +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 "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISDLL_IMPORT" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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"
@@ -80,8 +79,7 @@
# ADD BSC32 /nologo
LINK32=xilink6.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 vorbis_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbisenc.def" /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"../../vorbis/win32/Vorbis_Dynamic_Debug"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll"
!ENDIF
@@ -96,25 +94,153 @@
SOURCE=..\lib\vorbisenc.c
# End Source File
+# Begin Source File
+
+SOURCE=.\vorbisenc.def
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\include\vorbis\vorbisenc.h
+SOURCE=..\lib\backends.h
# End Source File
-# End Group
-# Begin Group "Resource Files"
+# Begin Source File
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "Other Files"
+SOURCE=..\lib\bitrate.h
+# End Source File
+# Begin Source File
-# PROP Default_Filter ".def"
+SOURCE=..\lib\codebook.h
+# End Source File
# Begin Source File
-SOURCE=.\vorbisenc.def
+SOURCE=..\include\vorbis\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codec_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\envelope.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\floor_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\floor\floor_books.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\highlevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mdct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\psy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_11.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\coupled\res_books_stereo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\uncoupled\res_books_uncoupled.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_44u.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_11.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_22.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_44u.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_X.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\smallft.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisenc.h
# End Source File
# End Group
# End Target
Index: win32/vorbisenc_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_static.dsp,v
retrieving revision 1.9
diff -u -d -r1.9 vorbisenc_static.dsp
--- win32/vorbisenc_static.dsp 25 Oct 2003 12:09:05 -0000 1.9
+++ win32/vorbisenc_static.dsp 25 Oct 2003 17:34:34 -0000
@@ -41,7 +41,7 @@
# 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 /GB /MT /W3 /GX /O2 /Ob1 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /O3 /QaxK /Qsox- /Qip /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# 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" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,6 +93,142 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\lib\backends.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\bitrate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\vorbis\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\codec_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\envelope.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\floor_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\floor\floor_books.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\highlevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\mdct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\psy.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_11.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\psych_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\coupled\res_books_stereo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\books\uncoupled\res_books_uncoupled.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_44u.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\residue_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_11.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_16.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_22.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_32.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_44.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_44u.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_8.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\modes\setup_X.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\smallft.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\vorbis\vorbisenc.h
# End Source File
# End Group
Index: win32/vorbisfile_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile_dynamic.dsp,v
retrieving revision 1.9
diff -u -d -r1.9 vorbisfile_dynamic.dsp
--- win32/vorbisfile_dynamic.dsp 25 Oct 2003 12:09:05 -0000 1.9
+++ win32/vorbisfile_dynamic.dsp 25 Oct 2003 17:34:34 -0000
@@ -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 /GB /MD /W3 /GX /O2 /Ob1 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /D "VORBIS_IEEE_FLOAT32" /D "_USE_NON_INTEL_COMPILER" /YX /FD /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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=xilink6.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:"VorbisFile_Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"VorbisFile_Dynamic_Release/vorbisfile.dll"
!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 "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /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=xilink6.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_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"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"VorbisFile_Dynamic_Debug/vorbisfile_d.dll"
!ENDIF
@@ -94,25 +94,37 @@
SOURCE=..\lib\vorbisfile.c
# End Source File
+# Begin Source File
+
+SOURCE=.\vorbisfile.def
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\include\vorbis\vorbisfile.h
+SOURCE=..\include\vorbis\codec.h
# End Source File
-# End Group
-# Begin Group "Resource Files"
+# Begin Source File
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "Other Files"
+SOURCE=..\lib\misc.h
+# End Source File
+# Begin Source File
-# PROP Default_Filter ".def"
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
# Begin Source File
-SOURCE=.\vorbisfile.def
+SOURCE=..\lib\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisfile.h
# End Source File
# End Group
# End Target
Index: win32/vorbisfile_static.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisfile_static.dsp,v
retrieving revision 1.9
diff -u -d -r1.9 vorbisfile_static.dsp
--- win32/vorbisfile_static.dsp 25 Oct 2003 12:09:05 -0000 1.9
+++ win32/vorbisfile_static.dsp 25 Oct 2003 17:34:34 -0000
@@ -41,7 +41,7 @@
# 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 /GB /MT /W3 /GX /O2 /Ob1 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /O3 /QaxK /Qsox- /Qip /c
+# ADD CPP /nologo /MT /O2 /I "../../ogg/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# 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 /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /Gm /Zi /Od /I "../../ogg/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -93,6 +93,26 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\include\vorbis\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\ogg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\lib\os.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\ogg\include\ogg\os_types.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\vorbis\vorbisfile.h
# End Source File
# End Group
-------------- next part --------------
Changes:
- Added stdio include to prevent some needless warnings.
- Added binary file workaround for CodeWarrior on Mac.
Index: examples/chaining_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/chaining_example.c,v
retrieving revision 1.18
diff -u -d -r1.18 chaining_example.c
--- examples/chaining_example.c 11 Oct 2002 11:14:41 -0000 1.18
+++ examples/chaining_example.c 25 Oct 2003 17:34:33 -0000
@@ -15,6 +15,7 @@
********************************************************************/
+#include <stdio.h>
#include <stdlib.h>
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
Index: examples/decoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/decoder_example.c,v
retrieving revision 1.27
diff -u -d -r1.27 decoder_example.c
--- examples/decoder_example.c 12 Jul 2002 15:07:52 -0000 1.27
+++ examples/decoder_example.c 25 Oct 2003 17:34:34 -0000
@@ -69,6 +69,9 @@
char **argv;
argc=ccommand(&argv); /* get a "command line" from the Mac user */
/* this also lets the user set stdin and stdout */
+ /* We also need to set stdin/stdout to binary mode. Damn MacOS. :) */
+ __reopen(stdin);
+ __reopen(stdout);
}
#endif
Index: examples/encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.50
diff -u -d -r1.50 encoder_example.c
--- examples/encoder_example.c 16 Jul 2002 09:26:07 -0000 1.50
+++ examples/encoder_example.c 25 Oct 2003 17:34:34 -0000
@@ -60,6 +60,9 @@
char **argv = NULL;
argc = ccommand(&argv); /* get a "command line" from the Mac user */
/* this also lets the user set stdin and stdout */
+ /* We also need to set stdin/stdout to binary mode. Damn MacOS. :) */
+ __reopen(stdin);
+ __reopen(stdout);
#endif
/* we cheat on the WAV header; we just bypass 44 bytes and never
-------------- next part --------------
Changes:
- Added vorbis dependency to vorbisfile subproject.
Index: all.dsw
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/all.dsw,v
retrieving revision 1.1
diff -u -d -r1.1 all.dsw
--- all.dsw 13 Sep 2001 19:55:00 -0000 1.1
+++ all.dsw 25 Oct 2003 17:34:50 -0000
@@ -128,6 +128,9 @@
+ Begin Project Dependency
+ Project_Dep_Name vorbis_dynamic
+ End Project Dependency
}}}
###############################################################################
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Dependency
Type: application/octet-stream
Size: 0 bytes
Desc: Dependency
Url : http://lists.xiph.org/pipermail/vorbis-dev/attachments/20031025/4519520c/Dependency-0001.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: part
Type: application/pgp-signature
Size: 184 bytes
Desc: not available
Url : http://lists.xiph.org/pipermail/vorbis-dev/attachments/20031025/4519520c/part-0001.pgp
More information about the Vorbis-dev
mailing list