From 56c7bab7f9966a599ca37c9613ea9e0228fe2915 Mon Sep 17 00:00:00 2001 From: oddsock Date: Fri, 16 Jul 2004 03:45:43 +0000 Subject: mostly win32 project updates added config.h added win32 specific README for certain build options git-svn-id: http://svn.xiph.org/trunk/speex@7150 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- win32/Makefile.am | 2 +- win32/config.h | 1 + win32/libspeex/Makefile.am | 2 +- win32/libspeex/libspeex.dsp | 600 ++++++++++++++++++------------------ win32/libspeex/libspeex.dsw | 12 + win32/libspeex/libspeex_dynamic.dsp | 311 +++++++++++++++++++ win32/libspeex/speex.def | 49 +++ win32/speex.iss | 99 +++--- win32/speexdec/speexdec.dsp | 260 ++++++++-------- win32/speexenc/speexenc.dsp | 244 +++++++-------- win32/speexlogo.bmp | Bin 155684 -> 0 bytes 11 files changed, 988 insertions(+), 592 deletions(-) create mode 100644 win32/config.h create mode 100644 win32/libspeex/libspeex_dynamic.dsp create mode 100644 win32/libspeex/speex.def delete mode 100755 win32/speexlogo.bmp (limited to 'win32') diff --git a/win32/Makefile.am b/win32/Makefile.am index f57af23..997d825 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -5,4 +5,4 @@ SUBDIRS = libspeex speexenc speexdec -EXTRA_DIST = speex.iss speexlogo.bmp +EXTRA_DIST = speex.iss diff --git a/win32/config.h b/win32/config.h new file mode 100644 index 0000000..18eec59 --- /dev/null +++ b/win32/config.h @@ -0,0 +1 @@ +#define inline __inline diff --git a/win32/libspeex/Makefile.am b/win32/libspeex/Makefile.am index 6850e2f..9430c78 100644 --- a/win32/libspeex/Makefile.am +++ b/win32/libspeex/Makefile.am @@ -3,4 +3,4 @@ # Disable automatic dependency tracking if using other tools than gcc and gmake #AUTOMAKE_OPTIONS = no-dependencies -EXTRA_DIST = libspeex.dsp libspeex.dsw +EXTRA_DIST = libspeex.dsp libspeex.dsw libspeex_dynamic.dsp speex.def diff --git a/win32/libspeex/libspeex.dsp b/win32/libspeex/libspeex.dsp index b930d55..47a8b5c 100644 --- a/win32/libspeex/libspeex.dsp +++ b/win32/libspeex/libspeex.dsp @@ -1,298 +1,302 @@ -# Microsoft Developer Studio Project File - Name="libspeex" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libspeex - 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 "libspeex.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 "libspeex.mak" CFG="libspeex - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libspeex - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libspeex - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "Perforce Project" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libspeex - 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 "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /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)" == "libspeex - 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 "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /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 "libspeex - Win32 Release" -# Name "libspeex - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\libspeex\bits.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\cb_search.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_10_16_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_10_32_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_20_32_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_5_256_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_5_64_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\exc_8_128_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filters.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\gain_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\gain_table_lbr.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\hexc_10_32_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\hexc_table.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\high_lsp_tables.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\lpc.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\lsp.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\lsp_tables_nb.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\ltp.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\math_approx.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\misc.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\modes.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\nb_celp.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\preprocess.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\quant_lsp.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\sb_celp.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_callbacks.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_header.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\stereo.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\vbr.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\vq.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\libspeex\cb_search.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filters.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\lpc.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\lsp.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\ltp.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\misc.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\modes.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\nb_celp.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\quant_lsp.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\sb_celp.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_bits.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_callbacks.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_denoise.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_header.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\speex_stereo.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\stack_alloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\vbr.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\vq.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libspeex" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libspeex - 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 "libspeex.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 "libspeex.mak" CFG="libspeex - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libspeex - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libspeex - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "Perforce Project" +# PROP Scc_LocalPath "..\.." +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libspeex - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /I "../../include" /I "../" /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /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)" == "libspeex - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /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 "libspeex - Win32 Release" +# Name "libspeex - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\libspeex\bits.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\cb_search.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_10_16_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_10_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_20_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_5_256_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_5_64_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_8_128_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\filters.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\gain_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\gain_table_lbr.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\hexc_10_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\hexc_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\high_lsp_tables.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lpc.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp_tables_nb.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\ltp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\math_approx.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\misc.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\modes.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\nb_celp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\preprocess.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\quant_lsp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\sb_celp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\smallft.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_callbacks.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_header.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\stereo.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vbr.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vq.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\libspeex\cb_search.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\filters.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lpc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\ltp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\misc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\modes.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\nb_celp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\quant_lsp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\sb_celp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\smallft.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_bits.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_callbacks.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_denoise.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_header.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_stereo.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\stack_alloc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vbr.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vq.h +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/libspeex/libspeex.dsw b/win32/libspeex/libspeex.dsw index 7257f30..9fb56fe 100644 --- a/win32/libspeex/libspeex.dsw +++ b/win32/libspeex/libspeex.dsw @@ -15,6 +15,18 @@ Package=<4> ############################################################################### +Project: "libspeex_dynamic"=.\libspeex_dynamic.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Global: Package=<5> diff --git a/win32/libspeex/libspeex_dynamic.dsp b/win32/libspeex/libspeex_dynamic.dsp new file mode 100644 index 0000000..5e00972 --- /dev/null +++ b/win32/libspeex/libspeex_dynamic.dsp @@ -0,0 +1,311 @@ +# Microsoft Developer Studio Project File - Name="libspeex_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=libspeex_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 "libspeex_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 "libspeex_dynamic.mak" CFG="libspeex_dynamic - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libspeex_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libspeex_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)" == "libspeex_dynamic - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "libspeex_dynamic___Win32_Release" +# PROP BASE Intermediate_Dir "libspeex_dynamic___Win32_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "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 "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /D "HAVE_CONFIG_H" /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 /nologo /dll /machine:I386 /out:"Release/libspeex.dll" + +!ELSEIF "$(CFG)" == "libspeex_dynamic - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "libspeex_dynamic___Win32_Debug" +# PROP BASE Intermediate_Dir "libspeex_dynamic___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "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 "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /D "HAVE_CONFIG_H" /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 /nologo /dll /debug /machine:I386 /out:"Debug/libspeex.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libspeex_dynamic - Win32 Release" +# Name "libspeex_dynamic - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\libspeex\bits.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\cb_search.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_10_16_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_10_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_20_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_5_256_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_5_64_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\exc_8_128_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\filters.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\gain_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\gain_table_lbr.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\hexc_10_32_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\hexc_table.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\high_lsp_tables.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lpc.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp_tables_nb.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\ltp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\math_approx.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\misc.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\modes.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\nb_celp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\preprocess.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\quant_lsp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\sb_celp.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\smallft.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex.c +# End Source File +# Begin Source File + +SOURCE=.\speex.def +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_callbacks.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_header.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\stereo.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vbr.c +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vq.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\libspeex\cb_search.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\filters.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lpc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\lsp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\ltp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\misc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\modes.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\nb_celp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\quant_lsp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\sb_celp.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\smallft.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_bits.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_callbacks.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_denoise.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_header.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\speex_stereo.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\stack_alloc.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vbr.h +# End Source File +# Begin Source File + +SOURCE=..\..\libspeex\vq.h +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/libspeex/speex.def b/win32/libspeex/speex.def new file mode 100644 index 0000000..cb89364 --- /dev/null +++ b/win32/libspeex/speex.def @@ -0,0 +1,49 @@ +; +; speex.def +; +LIBRARY +EXPORTS +; +speex_encoder_init +speex_encoder_destroy +speex_encode +speex_encoder_ctl +speex_decoder_init +speex_decoder_destroy +speex_decode +speex_decoder_ctl +speex_mode_query +speex_lib_ctl +speex_bits_init +speex_bits_init_buffer +speex_bits_destroy +speex_bits_reset +speex_bits_rewind +speex_bits_read_from +speex_bits_read_whole_bytes +speex_bits_write +speex_bits_write_whole_bytes +speex_bits_pack +speex_bits_unpack_signed +speex_bits_unpack_unsigned +speex_bits_nbytes +speex_bits_peek_unsigned +speex_bits_peek +speex_bits_advance +speex_bits_remaining +speex_bits_insert_terminator +speex_inband_handler +speex_std_mode_request_handler +speex_std_high_mode_request_handler +speex_std_char_handler +speex_default_user_handler +speex_std_low_mode_request_handler +speex_std_vbr_request_handler +speex_std_enh_request_handler +speex_std_vbr_quality_request_handler +speex_init_header +speex_header_to_packet +speex_packet_to_header +speex_encode_stereo +speex_decode_stereo +speex_std_stereo_request_handler diff --git a/win32/speex.iss b/win32/speex.iss index 8252817..2cc044c 100755 --- a/win32/speex.iss +++ b/win32/speex.iss @@ -1,40 +1,59 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[Setup] -AppName=Speex -AppVerName=Speex V1.1.4 -AppPublisherURL=http://www.speex.org -AppSupportURL=http://www.speex.org -AppUpdatesURL=http://www.speex.org -DefaultDirName={pf}\Speex -DefaultGroupName=Speex -AllowNoIcons=yes -LicenseFile=..\COPYING -InfoAfterFile=..\README -OutputDir=. -OutputBaseFilename=speex_win32_1.1.4_setup -WizardImageFile=speexlogo.bmp -; uncomment the following line if you want your installation to run on NT 3.51 too. -; MinVersion=4,3.51 - -[Tasks] -;Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4 - -[Dirs] -Name: "{app}" -Name: "{app}\doc" - -[Files] -Source: "speexdec\Release\speexdec.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "speexenc\Release\speexenc.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\doc\draft-herlein-speex-rtp-profile-00.txt"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\manual.lyx"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\programming.html"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\rtp.txt"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\sampledec.c"; DestDir: "{app}\doc"; Flags: ignoreversion -Source: "..\doc\sampleenc.c"; DestDir: "{app}\doc"; Flags: ignoreversion - -[Run] - +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +AppName=Speex +AppVerName=Speex V1.1.6 +AppPublisherURL=http://www.speex.org +AppSupportURL=http://www.speex.org +AppUpdatesURL=http://www.speex.org +DefaultDirName={pf}\Speex +DefaultGroupName=Speex +AllowNoIcons=yes +LicenseFile=..\COPYING +InfoAfterFile=..\README +OutputDir=. +OutputBaseFilename=speex_win32_1.1.6_setup +; uncomment the following line if you want your installation to run on NT 3.51 too. +; MinVersion=4,3.51 + +[Tasks] +;Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4 + +[Dirs] +Name: "{app}" +Name: "{app}\doc" +Name: "{app}\html" +Name: "{app}\libspeex" +Name: "{app}\libspeex\include" + +[Files] +Source: "speexdec\Release\speexdec.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "speexenc\Release\speexenc.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "libspeex\Release\libspeex.lib"; DestDir: "{app}\libspeex"; Flags: ignoreversion +Source: "libspeex\Release\libspeex.exp"; DestDir: "{app}\libspeex"; Flags: ignoreversion +Source: "libspeex\Release\libspeex.dll"; DestDir: "{app}\libspeex"; Flags: ignoreversion +Source: "..\include\speex\speex.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_bits.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_callbacks.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_echo.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_header.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_jitter.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_noglobals.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_preprocess.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\include\speex\speex_stereo.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion +Source: "..\doc\draft-herlein-avt-rtp-speex-00.txt"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\manual.lyx"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\programming.html"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\rtp.txt"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\sampledec.c"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\doc\sampleenc.c"; DestDir: "{app}\doc"; Flags: ignoreversion +Source: "..\html\index.html"; DestDir: "{app}\html"; Flags: ignoreversion +Source: "..\html\patents.html"; DestDir: "{app}\html"; Flags: ignoreversion +Source: "..\html\speex.png"; DestDir: "{app}\html"; Flags: ignoreversion +Source: "..\html\speex.webprj"; DestDir: "{app}\html"; Flags: ignoreversion +Source: "..\html\speex.xcf"; DestDir: "{app}\html"; Flags: ignoreversion + +[Run] + diff --git a/win32/speexdec/speexdec.dsp b/win32/speexdec/speexdec.dsp index 36860ff..64fcd46 100644 --- a/win32/speexdec/speexdec.dsp +++ b/win32/speexdec/speexdec.dsp @@ -1,130 +1,130 @@ -# Microsoft Developer Studio Project File - Name="speexdec" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=speexdec - 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 "speexdec.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 "speexdec.mak" CFG="speexdec - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "speexdec - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "speexdec - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "speexdec - 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 "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /GX /O2 /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /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 /subsystem:console /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 winmm.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib" - -!ELSEIF "$(CFG)" == "speexdec - 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 "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /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 /subsystem:console /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 winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "speexdec - Win32 Release" -# Name "speexdec - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\getopt.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\getopt1.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\speexdec.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\wav_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\wave_out.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\src\getopt_win.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\wav_io.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\wave_out.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 -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="speexdec" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=speexdec - 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 "speexdec.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 "speexdec.mak" CFG="speexdec - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "speexdec - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "speexdec - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "speexdec - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /GX /O2 /I "../../libspeex" /I "../../../ogg/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /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 /subsystem:console /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 winmm.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib" + +!ELSEIF "$(CFG)" == "speexdec - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../libspeex" /I "../../../ogg/include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /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 /subsystem:console /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 winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "speexdec - Win32 Release" +# Name "speexdec - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\src\getopt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\getopt1.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\speexdec.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\wav_io.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\wave_out.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\src\getopt_win.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\wav_io.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\wave_out.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 +# End Target +# End Project diff --git a/win32/speexenc/speexenc.dsp b/win32/speexenc/speexenc.dsp index 7c57ed6..4b9dd89 100644 --- a/win32/speexenc/speexenc.dsp +++ b/win32/speexenc/speexenc.dsp @@ -1,122 +1,122 @@ -# Microsoft Developer Studio Project File - Name="speexenc" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=speexenc - 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 "speexenc.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 "speexenc.mak" CFG="speexenc - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "speexenc - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "speexenc - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "speexenc - 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 "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /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 /subsystem:console /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 /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib" - -!ELSEIF "$(CFG)" == "speexenc - 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 "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /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 /subsystem:console /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 /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "speexenc - Win32 Release" -# Name "speexenc - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\getopt.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\getopt1.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\speexenc.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\wav_io.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\src\getopt_win.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\wav_io.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 -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="speexenc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=speexenc - 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 "speexenc.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 "speexenc.mak" CFG="speexenc - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "speexenc - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "speexenc - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "speexenc - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /I "../../libspeex" /I "../../../ogg/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /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 /subsystem:console /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 /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib" + +!ELSEIF "$(CFG)" == "speexenc - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../libspeex" /I "../../../ogg/include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /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 /subsystem:console /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 /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "speexenc - Win32 Release" +# Name "speexenc - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\src\getopt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\getopt1.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\speexenc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\wav_io.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\src\getopt_win.h +# End Source File +# Begin Source File + +SOURCE=..\..\src\wav_io.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 +# End Target +# End Project diff --git a/win32/speexlogo.bmp b/win32/speexlogo.bmp deleted file mode 100755 index 4a360e5..0000000 Binary files a/win32/speexlogo.bmp and /dev/null differ -- cgit v1.2.3