Update to Windows project files by Alexander Chemeris.

git-svn-id: http://svn.xiph.org/trunk/speex@14157 0101bb08-14d6-0310-b084-bc0e0c8e3800

diff --git a/win32/Makefile.am b/win32/Makefile.am
index 0823f46..084ace2 100644 (file)
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -5,4 +5,4 @@
 \r
 SUBDIRS = libspeex speexenc speexdec VS2003 VS2005\r
 \r
-EXTRA_DIST = speex.iss config.h\r
+EXTRA_DIST = speex.iss config.h libspeex.def libspeexdsp.def\r

diff --git a/win32/VS2003/Makefile.am b/win32/VS2003/Makefile.am
index 3fec6aa..15479c3 100644 (file)
--- a/win32/VS2003/Makefile.am
+++ b/win32/VS2003/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake\r
 #AUTOMAKE_OPTIONS = no-dependencies\r
 \r
-SUBDIRS = libspeex speexenc speexdec tests\r
+SUBDIRS = libspeex libspeexdsp speexenc speexdec tests\r
 \r
 EXTRA_DIST = libspeex.sln\r

diff --git a/win32/VS2003/libspeex.sln b/win32/VS2003/libspeex.sln
index 048fde0..4693b1a 100644 (file)
--- a/win32/VS2003/libspeex.sln
+++ b/win32/VS2003/libspeex.sln
@@ -11,16 +11,17 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexenc", "speexenc\speexenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"\r
@@ -40,7 +41,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_wb", "tests\testenc
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
        EndProjectSection\r
 EndProject\r
 Global\r
@@ -68,6 +73,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32\r
@@ -75,6 +81,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.ActiveCfg = Release|Win32\r
@@ -82,6 +89,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.ActiveCfg = Release|Win32\r
@@ -89,6 +97,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.ActiveCfg = Release|Win32\r
@@ -104,6 +113,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.ActiveCfg = Release|Win32\r
@@ -111,6 +121,7 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.ActiveCfg = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.Build.0 = Debug|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.ActiveCfg = Release|Win32\r
@@ -118,6 +129,15 @@ Global
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
                {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.ActiveCfg = Debug|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.Build.0 = Debug|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.ActiveCfg = Release|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.Build.0 = Release|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32\r
+               {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/win32/VS2003/libspeex/Makefile.am b/win32/VS2003/libspeex/Makefile.am
index 35cf918..5de466c 100644 (file)
--- a/win32/VS2003/libspeex/Makefile.am
+++ b/win32/VS2003/libspeex/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake\r
 #AUTOMAKE_OPTIONS = no-dependencies\r
 \r
-EXTRA_DIST = libspeex.def libspeex.vcproj\r
+EXTRA_DIST = libspeex.vcproj\r
 \r
 \r

diff --git a/win32/VS2003/libspeex/libspeex.def b/win32/VS2003/libspeex/libspeex.def
deleted file mode 100644 (file)
index 2dc28eb..0000000
--- a/win32/VS2003/libspeex/libspeex.def
+++ /dev/null
@@ -1,135 +0,0 @@
-LIBRARY libspeex
-EXPORTS
-
-
-;
-;      speex.h
-;
-speex_encoder_init
-speex_encoder_destroy
-speex_encode
-speex_encode_int
-speex_encoder_ctl
-speex_decoder_init
-speex_decoder_destroy
-speex_decode
-speex_decode_int
-speex_decoder_ctl
-speex_mode_query
-speex_lib_ctl
-speex_lib_get_mode
-
-;
-;      speex_bits.h
-;
-speex_bits_init
-speex_bits_init_buffer
-speex_bits_set_bit_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_callbacks.h
-;
-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_echo.h
-;
-speex_echo_state_init
-speex_echo_state_destroy
-speex_echo_cancellation
-speex_echo_cancel
-speex_echo_capture
-speex_echo_playback
-speex_echo_state_reset
-speex_echo_ctl
-
-;
-;      speex_header.h
-;
-speex_init_header
-speex_header_to_packet
-speex_packet_to_header
-
-;
-;      speex_jitter.h
-;
-jitter_buffer_init
-jitter_buffer_reset
-jitter_buffer_destroy
-jitter_buffer_put
-jitter_buffer_get
-jitter_buffer_get_pointer_timestamp
-jitter_buffer_tick
-jitter_buffer_update_delay
-speex_jitter_init
-speex_jitter_destroy
-speex_jitter_put
-speex_jitter_get
-speex_jitter_get_pointer_timestamp
-
-;
-;      speex_preprocess.h
-;
-speex_preprocess_state_init
-speex_preprocess_state_destroy
-speex_preprocess_run
-speex_preprocess
-speex_preprocess_estimate_update
-speex_preprocess_ctl
-
-;
-;      speex_resampler.h
-;
-speex_resampler_init
-speex_resampler_init_frac
-speex_resampler_destroy
-speex_resampler_process_float
-speex_resampler_process_int
-speex_resampler_process_interleaved_float
-speex_resampler_process_interleaved_int
-speex_resampler_set_rate
-speex_resampler_get_rate
-speex_resampler_set_rate_frac
-speex_resampler_get_ratio
-speex_resampler_set_quality
-speex_resampler_get_quality
-speex_resampler_set_input_stride
-speex_resampler_get_input_stride
-speex_resampler_set_output_stride
-speex_resampler_get_output_stride
-speex_resampler_skip_zeros
-speex_resampler_reset_mem
-speex_resampler_strerror
-
-;
-;      speex_stereo.h
-;
-speex_encode_stereo
-speex_encode_stereo_int
-speex_decode_stereo
-speex_decode_stereo_int
-speex_std_stereo_request_handler

diff --git a/win32/VS2003/libspeex/libspeex.vcproj b/win32/VS2003/libspeex/libspeex.vcproj
index 010c3a9..92d0e7e 100644 (file)
--- a/win32/VS2003/libspeex/libspeex.vcproj
+++ b/win32/VS2003/libspeex/libspeex.vcproj
@@ -25,7 +25,7 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
+                               WarningLevel="3"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                DebugInformationFormat="4"\r
                                CompileAs="1"/>\r
@@ -74,9 +74,8 @@
                                ExceptionHandling="FALSE"\r
                                RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
-                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
+                               WarningLevel="3"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
@@ -173,14 +172,14 @@
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="3"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\.."\r
-                               PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
+                               PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
                                RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
+                               WarningLevel="3"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                DebugInformationFormat="3"\r
                                CompileAs="1"\r
@@ -190,7 +189,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="../../../bin/libspeex.dll"\r
-                               ModuleDefinitionFile="libspeex.def"\r
+                               ModuleDefinitionFile="..\..\libspeex.def"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                OptimizeForWindows98="1"\r
@@ -249,12 +248,6 @@
                                RelativePath="..\..\..\libspeex\exc_8_128_table.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\fftwrap.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\filterbank.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\filters.c">\r
                        </File>\r
                        <File\r
@@ -273,18 +266,6 @@
                                RelativePath="..\..\..\libspeex\high_lsp_tables.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\jitter.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\kiss_fft.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\kiss_fftr.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\lbr_48k_tables.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\lpc.c">\r
                        </File>\r
                        <File\r
@@ -297,36 +278,21 @@
                                RelativePath="..\..\..\libspeex\ltp.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\math_approx.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\mdf.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\misc.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\modes.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\nb_celp.c">\r
+                               RelativePath="..\..\..\libspeex\modes_wb.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\preprocess.c">\r
+                               RelativePath="..\..\..\libspeex\nb_celp.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\quant_lsp.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\resample.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\sb_celp.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\smallft.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\speex.c">\r
                        </File>\r
                        <File\r
@@ -342,9 +308,6 @@
                                RelativePath="..\..\..\libspeex\vbr.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\vorbis_psy.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\vq.c">\r
                        </File>\r
                        <File\r
@@ -356,9 +319,6 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\_kiss_fft_guts.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\arch.h">\r
                        </File>\r
                        <File\r
@@ -368,15 +328,6 @@
                                RelativePath="..\..\..\libspeex\cb_search_sse.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\config.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\fftwrap.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\filterbank.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\filters.h">\r
                        </File>\r
                        <File\r
@@ -389,12 +340,6 @@
                                RelativePath="..\..\..\libspeex\fixed_generic.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\kiss_fft.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libspeex\kiss_fftr.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\lpc.h">\r
                        </File>\r
                        <File\r
@@ -410,16 +355,13 @@
                                RelativePath="..\..\..\libspeex\math_approx.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\misc.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\modes.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\nb_celp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\pseudofloat.h">\r
+                               RelativePath="..\..\..\libspeex\os_support.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\quant_lsp.h">\r
@@ -428,18 +370,12 @@
                                RelativePath="..\..\..\libspeex\sb_celp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\smallft.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\stack_alloc.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\vbr.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\vorbis_psy.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\vq.h">\r
                        </File>\r
                        <File\r
@@ -447,11 +383,6 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
-               </Filter>\r
-               <Filter\r
                        Name="Public Header Files"\r
                        Filter="">\r
                        <File\r
@@ -464,29 +395,25 @@
                                RelativePath="..\..\..\include\speex\speex_callbacks.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\include\speex\speex_echo.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\include\speex\speex_header.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\include\speex\speex_jitter.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\include\speex\speex_preprocess.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\include\speex\speex_resampler.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\include\speex\speex_stereo.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\include\speex\speex_types.h">\r
                        </File>\r
                </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
+               </Filter>\r
+               <File\r
+                       RelativePath="..\..\config.h">\r
+               </File>\r
                <File\r
-                       RelativePath=".\libspeex.def">\r
+                       RelativePath="..\..\libspeex.def">\r
                </File>\r
        </Files>\r
        <Globals>\r

diff --git a/win32/config.h b/win32/config.h
index bdfbbc8..b46b9a9 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
@@ -9,4 +9,6 @@
 #endif\r
 \r
 /* Default to floating point */\r
-#define FLOATING_POINT\r
+#ifndef FIXED_POINT\r
+#  define FLOATING_POINT\r
+#endif\r

diff --git a/win32/libspeex/Makefile.am b/win32/libspeex/Makefile.am
index 9430c78..9cf4e85 100644 (file)
--- 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 libspeex_dynamic.dsp speex.def
+EXTRA_DIST = libspeex.dsw libspeex.dsp libspeex_dynamic.dsp libspeexdsp.dsp libspeexdsp_dynamic.dsp

diff --git a/win32/libspeex/libspeex.dsp b/win32/libspeex/libspeex.dsp
index ff0c705..9cfa169 100644 (file)
--- a/win32/libspeex/libspeex.dsp
+++ b/win32/libspeex/libspeex.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /GX /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c\r
+# ADD CPP /nologo /MD /GX- /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
@@ -67,7 +67,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /GX /Od /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c\r
+# ADD CPP /nologo /MDd /W3 /GX- /Zi /Od /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
@@ -121,14 +121,6 @@ SOURCE=..\..\libspeex\exc_8_128_table.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\fftwrap.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\filterbank.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\filters.c\r
 # End Source File\r
 # Begin Source File\r
@@ -153,22 +145,6 @@ SOURCE=..\..\libspeex\high_lsp_tables.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\jitter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fft.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fftr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\lbr_48k_tables.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\lpc.c\r
 # End Source File\r
 # Begin Source File\r
@@ -185,27 +161,15 @@ SOURCE=..\..\libspeex\ltp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\math_approx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\mdf.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\misc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\modes.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\nb_celp.c\r
+SOURCE=..\..\libspeex\modes_wb.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\preprocess.c\r
+SOURCE=..\..\libspeex\nb_celp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -213,18 +177,10 @@ SOURCE=..\..\libspeex\quant_lsp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\resample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\sb_celp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\smallft.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\speex.c\r
 # End Source File\r
 # Begin Source File\r
@@ -245,10 +201,6 @@ SOURCE=..\..\libspeex\vbr.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\vorbis_psy.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\vq.c\r
 # End Source File\r
 # Begin Source File\r
@@ -261,10 +213,6 @@ SOURCE=..\..\libspeex\window.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\_kiss_fft_guts.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\arch.h\r
 # End Source File\r
 # Begin Source File\r
@@ -277,14 +225,6 @@ SOURCE=..\..\libspeex\cb_search_sse.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\fftwrap.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\filterbank.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\filters.h\r
 # End Source File\r
 # Begin Source File\r
@@ -301,14 +241,6 @@ SOURCE=..\..\libspeex\fixed_generic.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\kiss_fft.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fftr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\lpc.h\r
 # End Source File\r
 # Begin Source File\r
@@ -329,10 +261,6 @@ SOURCE=..\..\libspeex\math_approx.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\misc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\modes.h\r
 # End Source File\r
 # Begin Source File\r
@@ -341,7 +269,7 @@ SOURCE=..\..\libspeex\nb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\pseudofloat.h\r
+SOURCE=..\..\libspeex\os_support.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -353,39 +281,39 @@ SOURCE=..\..\libspeex\sb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\smallft.h\r
+SOURCE=..\..\libspeex\stack_alloc.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex.h\r
+SOURCE=..\..\libspeex\vbr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_bits.h\r
+SOURCE=..\..\libspeex\vq.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_callbacks.h\r
+SOURCE=..\..\libspeex\vq_sse.h\r
 # End Source File\r
-# Begin Source File\r
+# End Group\r
+# Begin Group "Public Header Files"\r
 \r
-SOURCE=..\..\include\speex\speex_echo.h\r
-# End Source File\r
+# PROP Default_Filter "*.h"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_header.h\r
+SOURCE=..\..\include\speex\speex.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_jitter.h\r
+SOURCE=..\..\include\speex\speex_bits.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_preprocess.h\r
+SOURCE=..\..\include\speex\speex_callbacks.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_resampler.h\r
+SOURCE=..\..\include\speex\speex_header.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -395,26 +323,6 @@ SOURCE=..\..\include\speex\speex_stereo.h
 \r
 SOURCE=..\..\include\speex\speex_types.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\stack_alloc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vbr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vorbis_psy.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vq.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vq_sse.h\r
-# End Source File\r
 # End Group\r
 # Begin Source File\r
 \r

diff --git a/win32/libspeex/libspeex.dsw b/win32/libspeex/libspeex.dsw
index 9fb56fe..ff24f2a 100644 (file)
--- a/win32/libspeex/libspeex.dsw
+++ b/win32/libspeex/libspeex.dsw
@@ -27,6 +27,30 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "libspeexdsp"=.\libspeexdsp.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "libspeexdsp_dynamic"=.\libspeexdsp_dynamic.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Global:\r
 \r
 Package=<5>\r

diff --git a/win32/libspeex/libspeex_dynamic.dsp b/win32/libspeex/libspeex_dynamic.dsp
index b9d24e5..cd1945c 100644 (file)
--- a/win32/libspeex/libspeex_dynamic.dsp
+++ b/win32/libspeex/libspeex_dynamic.dsp
@@ -91,7 +91,7 @@ LINK32=link.exe
 # Name "libspeex_dynamic - Win32 Debug"\r
 # Begin Group "Source Files"\r
 \r
-# PROP Default_Filter ""\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
 SOURCE=..\..\libspeex\bits.c\r
@@ -126,14 +126,6 @@ SOURCE=..\..\libspeex\exc_8_128_table.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\fftwrap.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\filterbank.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\filters.c\r
 # End Source File\r
 # Begin Source File\r
@@ -158,22 +150,6 @@ SOURCE=..\..\libspeex\high_lsp_tables.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\jitter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fft.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fftr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\lbr_48k_tables.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\lpc.c\r
 # End Source File\r
 # Begin Source File\r
@@ -190,27 +166,15 @@ SOURCE=..\..\libspeex\ltp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\math_approx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\mdf.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\misc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\modes.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\nb_celp.c\r
+SOURCE=..\..\libspeex\modes_wb.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\preprocess.c\r
+SOURCE=..\..\libspeex\nb_celp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -218,18 +182,10 @@ SOURCE=..\..\libspeex\quant_lsp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\resample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\sb_celp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\smallft.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\speex.c\r
 # End Source File\r
 # Begin Source File\r
@@ -250,10 +206,6 @@ SOURCE=..\..\libspeex\vbr.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\vorbis_psy.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\vq.c\r
 # End Source File\r
 # Begin Source File\r
@@ -266,10 +218,6 @@ SOURCE=..\..\libspeex\window.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\_kiss_fft_guts.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\arch.h\r
 # End Source File\r
 # Begin Source File\r
@@ -282,14 +230,6 @@ SOURCE=..\..\libspeex\cb_search_sse.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\fftwrap.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\filterbank.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\filters.h\r
 # End Source File\r
 # Begin Source File\r
@@ -306,14 +246,6 @@ SOURCE=..\..\libspeex\fixed_generic.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\kiss_fft.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\kiss_fftr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\lpc.h\r
 # End Source File\r
 # Begin Source File\r
@@ -334,10 +266,6 @@ SOURCE=..\..\libspeex\math_approx.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\misc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\libspeex\modes.h\r
 # End Source File\r
 # Begin Source File\r
@@ -346,7 +274,7 @@ SOURCE=..\..\libspeex\nb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\pseudofloat.h\r
+SOURCE=..\..\libspeex\os_support.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -358,39 +286,39 @@ SOURCE=..\..\libspeex\sb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\smallft.h\r
+SOURCE=..\..\libspeex\stack_alloc.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex.h\r
+SOURCE=..\..\libspeex\vbr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_bits.h\r
+SOURCE=..\..\libspeex\vq.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_callbacks.h\r
+SOURCE=..\..\libspeex\vq_sse.h\r
 # End Source File\r
-# Begin Source File\r
+# End Group\r
+# Begin Group "Public Header Files"\r
 \r
-SOURCE=..\..\include\speex\speex_echo.h\r
-# End Source File\r
+# PROP Default_Filter "*.h"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_header.h\r
+SOURCE=..\..\include\speex\speex.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_jitter.h\r
+SOURCE=..\..\include\speex\speex_bits.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_preprocess.h\r
+SOURCE=..\..\include\speex\speex_callbacks.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\speex\speex_resampler.h\r
+SOURCE=..\..\include\speex\speex_header.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -400,26 +328,6 @@ SOURCE=..\..\include\speex\speex_stereo.h
 \r
 SOURCE=..\..\include\speex\speex_types.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\stack_alloc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vbr.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vorbis_psy.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vq.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\libspeex\vq_sse.h\r
-# End Source File\r
 # End Group\r
 # Begin Source File\r
 \r
@@ -427,7 +335,7 @@ SOURCE=..\config.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\speex.def\r
+SOURCE=..\libspeex.def\r
 # End Source File\r
 # End Target\r
 # End Project\r

diff --git a/win32/libspeex/speex.def b/win32/libspeex/speex.def
deleted file mode 100644 (file)
index 2dc28eb..0000000
--- a/win32/libspeex/speex.def
+++ /dev/null
@@ -1,135 +0,0 @@
-LIBRARY libspeex
-EXPORTS
-
-
-;
-;      speex.h
-;
-speex_encoder_init
-speex_encoder_destroy
-speex_encode
-speex_encode_int
-speex_encoder_ctl
-speex_decoder_init
-speex_decoder_destroy
-speex_decode
-speex_decode_int
-speex_decoder_ctl
-speex_mode_query
-speex_lib_ctl
-speex_lib_get_mode
-
-;
-;      speex_bits.h
-;
-speex_bits_init
-speex_bits_init_buffer
-speex_bits_set_bit_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_callbacks.h
-;
-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_echo.h
-;
-speex_echo_state_init
-speex_echo_state_destroy
-speex_echo_cancellation
-speex_echo_cancel
-speex_echo_capture
-speex_echo_playback
-speex_echo_state_reset
-speex_echo_ctl
-
-;
-;      speex_header.h
-;
-speex_init_header
-speex_header_to_packet
-speex_packet_to_header
-
-;
-;      speex_jitter.h
-;
-jitter_buffer_init
-jitter_buffer_reset
-jitter_buffer_destroy
-jitter_buffer_put
-jitter_buffer_get
-jitter_buffer_get_pointer_timestamp
-jitter_buffer_tick
-jitter_buffer_update_delay
-speex_jitter_init
-speex_jitter_destroy
-speex_jitter_put
-speex_jitter_get
-speex_jitter_get_pointer_timestamp
-
-;
-;      speex_preprocess.h
-;
-speex_preprocess_state_init
-speex_preprocess_state_destroy
-speex_preprocess_run
-speex_preprocess
-speex_preprocess_estimate_update
-speex_preprocess_ctl
-
-;
-;      speex_resampler.h
-;
-speex_resampler_init
-speex_resampler_init_frac
-speex_resampler_destroy
-speex_resampler_process_float
-speex_resampler_process_int
-speex_resampler_process_interleaved_float
-speex_resampler_process_interleaved_int
-speex_resampler_set_rate
-speex_resampler_get_rate
-speex_resampler_set_rate_frac
-speex_resampler_get_ratio
-speex_resampler_set_quality
-speex_resampler_get_quality
-speex_resampler_set_input_stride
-speex_resampler_get_input_stride
-speex_resampler_set_output_stride
-speex_resampler_get_output_stride
-speex_resampler_skip_zeros
-speex_resampler_reset_mem
-speex_resampler_strerror
-
-;
-;      speex_stereo.h
-;
-speex_encode_stereo
-speex_encode_stereo_int
-speex_decode_stereo
-speex_decode_stereo_int
-speex_std_stereo_request_handler

diff --git a/win32/speexenc/speexenc.dsw b/win32/speexenc/speexenc.dsw
index 525fa5d..d1e77b8 100644 (file)
--- a/win32/speexenc/speexenc.dsw
+++ b/win32/speexenc/speexenc.dsw
@@ -15,7 +15,19 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ogg_static"="..\..\..\libogg\win32\ogg_static.dsp" - Package Owner=<4>\r
+Project: "libspeexdsp"=..\libspeex\libspeexdsp.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "ogg_static"=..\..\..\libogg\win32\ogg_static.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -41,6 +53,9 @@ Package=<4>
     Begin Project Dependency\r
     Project_Dep_Name ogg_static\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libspeexdsp\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r