From a2174e7449403918eaa4c3e61d89cab2f4d35570 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Mon, 6 Nov 2000 09:48:26 +0000 Subject: [PATCH] vorbis.def wasn't exporting a few things that vorbisenc uses (maybe these shouldn't be outside the api? or is this a special case?) vorbisenc win32 stuff done. + automation. yay. svn path=/trunk/vorbis/; revision=996 --- win32/build_vorbisenc_dynamic.bat | 19 ++++++ win32/build_vorbisenc_dynamic_debug.bat | 19 ++++++ win32/build_vorbisenc_static.bat | 19 ++++++ win32/build_vorbisenc_static_debug.bat | 19 ++++++ win32/vorbis.def | 5 ++ win32/vorbisenc.def | 5 ++ win32/vorbisenc_dynamic.dsp | 115 ++++++++++++++++++++++++++++++++ win32/vorbisenc_static.dsp | 96 ++++++++++++++++++++++++++ 8 files changed, 297 insertions(+) create mode 100755 win32/build_vorbisenc_dynamic.bat create mode 100755 win32/build_vorbisenc_dynamic_debug.bat create mode 100755 win32/build_vorbisenc_static.bat create mode 100755 win32/build_vorbisenc_static_debug.bat create mode 100644 win32/vorbisenc.def create mode 100644 win32/vorbisenc_dynamic.dsp create mode 100644 win32/vorbisenc_static.dsp diff --git a/win32/build_vorbisenc_dynamic.bat b/win32/build_vorbisenc_dynamic.bat new file mode 100755 index 0000000..47362f3 --- /dev/null +++ b/win32/build_vorbisenc_dynamic.bat @@ -0,0 +1,19 @@ +@echo off +echo ---+++--- Building Vorbisenc (Dynamic) ---+++--- + +if .%SRCROOT%==. set SRCROOT=c:\src + +set OLDPATH=%PATH% +set OLDINCLUDE=%INCLUDE% +set OLDLIB=%LIB% + +call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat" +echo Setting include/lib paths for Vorbis +set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;c:\src\vorbis\include +set LIB=%LIB%;%SRCROOT%\ogg\win32\Dynamic_Release;%SRCROOT%\vorbis\win32\Dynamic_Release +echo Compiling... +msdev vorbisenc_dynamic.dsp /useenv /make "vorbisenc_dynamic - Win32 Release" /rebuild + +set PATH=%OLDPATH% +set INCLUDE=%OLDINCLUDE% +set LIB=%OLDLIB% diff --git a/win32/build_vorbisenc_dynamic_debug.bat b/win32/build_vorbisenc_dynamic_debug.bat new file mode 100755 index 0000000..68a913e --- /dev/null +++ b/win32/build_vorbisenc_dynamic_debug.bat @@ -0,0 +1,19 @@ +@echo off +echo ---+++--- Building Vorbisenc (Dynamic) ---+++--- + +if .%SRCROOT%==. set SRCROOT=c:\src + +set OLDPATH=%PATH% +set OLDINCLUDE=%INCLUDE% +set OLDLIB=%LIB% + +call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat" +echo Setting include/lib paths for Vorbis +set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;c:\src\vorbis\include +set LIB=%LIB%;%SRCROOT%\ogg\win32\Dynamic_Debug;%SRCROOT%\vorbis\win32\Dynamic_Debug +echo Compiling... +msdev vorbisenc_dynamic.dsp /useenv /make "vorbisenc_dynamic - Win32 Debug" /rebuild + +set PATH=%OLDPATH% +set INCLUDE=%OLDINCLUDE% +set LIB=%OLDLIB% diff --git a/win32/build_vorbisenc_static.bat b/win32/build_vorbisenc_static.bat new file mode 100755 index 0000000..9c13a48 --- /dev/null +++ b/win32/build_vorbisenc_static.bat @@ -0,0 +1,19 @@ +@echo off +echo ---+++--- Building Vorbisenc (Static) ---+++--- + +if .%SRCROOT%==. set SRCROOT=c:\src + +set OLDPATH=%PATH% +set OLDINCLUDE=%INCLUDE% +set OLDLIB=%LIB% + +call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat" +echo Setting include/lib paths for Vorbis +set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;c:\src\vorbis\include +set LIB=%LIB%;%SRCROOT%\ogg\win32\Static_Release;%SRCROOT%\vorbis\win32\Dynamic_Release +echo Compiling... +msdev vorbisenc_static.dsp /useenv /make "vorbisenc_static - Win32 Release" /rebuild + +set PATH=%OLDPATH% +set INCLUDE=%OLDINCLUDE% +set LIB=%OLDLIB% diff --git a/win32/build_vorbisenc_static_debug.bat b/win32/build_vorbisenc_static_debug.bat new file mode 100755 index 0000000..f794bf4 --- /dev/null +++ b/win32/build_vorbisenc_static_debug.bat @@ -0,0 +1,19 @@ +@echo off +echo ---+++--- Building Vorbisenc (Static) ---+++--- + +if .%SRCROOT%==. set SRCROOT=c:\src + +set OLDPATH=%PATH% +set OLDINCLUDE=%INCLUDE% +set OLDLIB=%LIB% + +call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat" +echo Setting include/lib paths for Vorbis +set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;c:\src\vorbis\include +set LIB=%LIB%;%SRCROOT%\ogg\win32\Static_Debug;%SRCROOT%\vorbis\win32\Dynamic_Debug +echo Compiling... +msdev vorbisenc_static.dsp /useenv /make "vorbisenc_static - Win32 Debug" /rebuild + +set PATH=%OLDPATH% +set INCLUDE=%OLDINCLUDE% +set LIB=%OLDLIB% diff --git a/win32/vorbis.def b/win32/vorbis.def index 2733e35..92dd40f 100644 --- a/win32/vorbis.def +++ b/win32/vorbis.def @@ -24,3 +24,8 @@ vorbis_synthesis vorbis_synthesis_blockin vorbis_synthesis_pcmout vorbis_synthesis_read +_vi_psy_copy +_mapping_P +_floor_P +_residue_P +_time_P diff --git a/win32/vorbisenc.def b/win32/vorbisenc.def new file mode 100644 index 0000000..3c4c126 --- /dev/null +++ b/win32/vorbisenc.def @@ -0,0 +1,5 @@ +; vorbisenc.def +LIBRARY vorbisenc +EXPORTS +vorbis_encode_init +vorbis_encode_ctl diff --git a/win32/vorbisenc_dynamic.dsp b/win32/vorbisenc_dynamic.dsp new file mode 100644 index 0000000..7089656 --- /dev/null +++ b/win32/vorbisenc_dynamic.dsp @@ -0,0 +1,115 @@ +# Microsoft Developer Studio Project File - Name="vorbisenc_dynamic" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=vorbisenc_dynamic - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "vorbisenc_dynamic.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "vorbisenc_dynamic.mak" CFG="vorbisenc_dynamic - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "vorbisenc_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "vorbisenc_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "vorbisenc_dynamic - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Dynamic_Release" +# PROP Intermediate_Dir "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 +# 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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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" + +!ELSEIF "$(CFG)" == "vorbisenc_dynamic - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vorbisenc_dynamic___Win32_Debug" +# PROP BASE Intermediate_Dir "vorbisenc_dynamic___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Dynamic_Debug" +# PROP Intermediate_Dir "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 +# 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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" + +!ENDIF + +# Begin Target + +# Name "vorbisenc_dynamic - Win32 Release" +# Name "vorbisenc_dynamic - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\lib\vorbisenc.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# 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=.\vorbisenc.def +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/vorbisenc_static.dsp b/win32/vorbisenc_static.dsp new file mode 100644 index 0000000..3ecf807 --- /dev/null +++ b/win32/vorbisenc_static.dsp @@ -0,0 +1,96 @@ +# Microsoft Developer Studio Project File - Name="vorbisenc_static" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=vorbisenc_static - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "vorbisenc_static.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "vorbisenc_static.mak" CFG="vorbisenc_static - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "vorbisenc_static - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "vorbisenc_static - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "vorbisenc_static - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Static_Release" +# PROP Intermediate_Dir "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 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "vorbisenc_static - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# 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 RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "vorbisenc_static - Win32 Release" +# Name "vorbisenc_static - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\lib\vorbisenc.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project -- 2.7.4