Update to Windows project files by Alexander Chemeris
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sun, 29 Jul 2007 10:40:18 +0000 (10:40 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sun, 29 Jul 2007 10:40:18 +0000 (10:40 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@13393 0101bb08-14d6-0310-b084-bc0e0c8e3800

22 files changed:
win32/VS2003/Makefile.am
win32/VS2003/libspeex.sln [new file with mode: 0644]
win32/VS2003/libspeex/libspeex.def
win32/VS2003/libspeex/libspeex.vcproj
win32/VS2003/speexdec/speexdec.vcproj
win32/VS2003/speexenc/speexenc.vcproj
win32/VS2003/tests/Makefile.am [new file with mode: 0644]
win32/VS2003/tests/testdenoise.vcproj [new file with mode: 0644]
win32/VS2003/tests/testecho.vcproj [new file with mode: 0644]
win32/VS2003/tests/testenc.vcproj [new file with mode: 0644]
win32/VS2003/tests/testenc_uwb.vcproj [new file with mode: 0644]
win32/VS2003/tests/testenc_wb.vcproj [new file with mode: 0644]
win32/VS2003/tests/testresample.vcproj [new file with mode: 0644]
win32/config.h
win32/libspeex/libspeex.dsp
win32/libspeex/libspeex_dynamic.dsp
win32/libspeex/speex.def
win32/speex.iss [changed mode: 0755->0644]
win32/speexdec/speexdec.dsp
win32/speexdec/speexdec.dsw
win32/speexenc/speexenc.dsp
win32/speexenc/speexenc.dsw

index d4698d7..3fec6aa 100644 (file)
@@ -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\r
+SUBDIRS = libspeex speexenc speexdec tests\r
 \r
-EXTRA_DIST = \r
+EXTRA_DIST = libspeex.sln\r
diff --git a/win32/VS2003/libspeex.sln b/win32/VS2003/libspeex.sln
new file mode 100644 (file)
index 0000000..048fde0
--- /dev/null
@@ -0,0 +1,126 @@
+Microsoft Visual Studio Solution File, Format Version 8.00\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex\libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdec", "speexdec\speexdec.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+       EndProjectSection\r
+EndProject\r
+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
+       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
+       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
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_uwb", "tests\testenc_uwb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_wb", "tests\testenc_wb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}\r
+       EndProjectSection\r
+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
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfiguration) = preSolution\r
+               Debug = Debug\r
+               Release = Release\r
+               Release_Dynamic_SSE = Release_Dynamic_SSE\r
+               Release_Static_SSE = Release_Static_SSE\r
+       EndGlobalSection\r
+       GlobalSection(ProjectDependencies) = postSolution\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfiguration) = postSolution\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.ActiveCfg = Debug|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.Build.0 = Debug|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.ActiveCfg = Release|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.Build.0 = Release|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32\r
+               {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.Build.0 = Release_Static_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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32\r
+               {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}.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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32\r
+               {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-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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.Build.0 = Release|Win32\r
+               {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-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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.Build.0 = Release|Win32\r
+               {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-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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.Build.0 = Release|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.Build.0 = Release_SSE|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.ActiveCfg = Debug|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.Build.0 = Debug|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.ActiveCfg = Release|Win32\r
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.Build.0 = Release|Win32\r
+               {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-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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.Build.0 = Release|Win32\r
+               {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-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
+               {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.Build.0 = Release|Win32\r
+               {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
+       EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+       EndGlobalSection\r
+       GlobalSection(ExtensibilityAddIns) = postSolution\r
+       EndGlobalSection\r
+EndGlobal\r
index 511e148..2dc28eb 100644 (file)
@@ -3,27 +3,28 @@ EXPORTS
 
 
 ;
-;      speex_echo.h
-;
-speex_echo_state_init
-speex_echo_state_destroy
-speex_echo_cancel
-speex_echo_state_reset
-
-;
-;      speex_preprocess.h
+;      speex.h
 ;
-speex_preprocess_state_init
-speex_preprocess_state_destroy
-speex_preprocess
-speex_preprocess_estimate_update
-speex_preprocess_ctl
+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
@@ -55,6 +56,18 @@ 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
@@ -64,6 +77,14 @@ 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
@@ -71,11 +92,38 @@ speex_jitter_get
 speex_jitter_get_pointer_timestamp
 
 ;
-;      speex_noglobals.h
+;      speex_preprocess.h
 ;
-;speex_mode_new
-;speex_mode_destroy
+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
@@ -85,24 +133,3 @@ speex_encode_stereo_int
 speex_decode_stereo
 speex_decode_stereo_int
 speex_std_stereo_request_handler
-
-;
-;      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
-
-
-
-
index 9808dfc..010c3a9 100644 (file)
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H; USE_ALLOCA"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"\r
                                MinimalRebuild="TRUE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -33,7 +33,7 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)/libspeex.lib"/>\r
+                               OutputFile="../../../lib/libspeex.lib"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H; USE_ALLOCA"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="FALSE"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="1"\r
-                               DisableSpecificWarnings="4244;4305;4311;4100;4127"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)/libspeex.lib"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release_SSE|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               GlobalOptimizations="TRUE"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
-                               FavorSizeOrSpeed="1"\r
-                               OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)/libspeex.lib"/>\r
+                               OutputFile="../../../lib/libspeex.lib"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_SSE2|Win32"\r
+                       Name="Release_Static_SSE|Win32"\r
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
-                               OptimizeForProcessor="3"\r
+                               OptimizeForProcessor="2"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
+                               PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
-                               EnableEnhancedInstructionSet="2"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)/libspeex.lib"/>\r
+                               OutputFile="../../../lib/libspeex.lib"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_Dynamic|Win32"\r
+                       Name="Release_Dynamic_SSE|Win32"\r
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
-                               OptimizeForProcessor="2"\r
+                               OptimizeForProcessor="3"\r
                                AdditionalIncludeDirectories="..\..\..\include;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
+                               PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               OutputFile="../../../bin/libspeex.dll"\r
                                ModuleDefinitionFile="libspeex.def"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"/>\r
+                               OptimizeForWindows98="1"\r
+                               ImportLibrary="../../../lib/libspeex.lib"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                RelativePath="..\..\..\libspeex\kiss_fftr.c">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\libspeex.def">\r
+                               RelativePath="..\..\..\libspeex\lbr_48k_tables.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\lpc.c">\r
                                RelativePath="..\..\..\libspeex\mdf.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\libspeex\medfilter.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\libspeex\misc.c">\r
                        </File>\r
                        <File\r
                                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
+                               RelativePath="..\..\..\libspeex\window.c">\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        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
                                RelativePath="..\..\..\libspeex\cb_search.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\libspeex\cb_search_sse.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\config.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\filters_sse.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\libspeex\fixed_debug.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\fixed_generic.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\libspeex\kiss_fft.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\libspeex\nb_celp.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\libspeex\pseudofloat.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\libspeex\quant_lsp.h">\r
                        </File>\r
                        <File\r
                                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
+                               RelativePath="..\..\..\libspeex\vq_sse.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
+               <Filter\r
+                       Name="Public Header Files"\r
+                       Filter="">\r
+                       <File\r
                                RelativePath="..\..\..\include\speex\speex.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\include\speex\speex_jitter.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\include\speex\speex_noglobals.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\include\speex\speex_preprocess.h">\r
                        </File>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\..\include\speex\speex_types.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\vq.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=".\ReadMe.txt">\r
+                       RelativePath=".\libspeex.def">\r
                </File>\r
        </Files>\r
        <Globals>\r
index a390be4..d950422 100644 (file)
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                MinimalRebuild="TRUE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexdec.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexdec.exe"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
                                SubSystem="1"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexdec.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexdec.exe"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexdec.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="TRUE"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release_SSE2|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               GlobalOptimizations="TRUE"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
-                               FavorSizeOrSpeed="1"\r
-                               OptimizeForProcessor="3"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="FALSE"\r
-                               EnableEnhancedInstructionSet="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="1"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexdec.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexdec.exe"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
index 4893cc9..68ef494 100644 (file)
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                MinimalRebuild="TRUE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexenc.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexenc.exe"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
                                SubSystem="1"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H: USE_ALLOCA"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexenc.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexenc.exe"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableIntrinsicFunctions="TRUE"\r
                                FavorSizeOrSpeed="1"\r
                                OptimizeForProcessor="2"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
                                StringPooling="TRUE"\r
                                ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="FALSE"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexenc.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="TRUE"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release_SSE2|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               GlobalOptimizations="TRUE"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
-                               FavorSizeOrSpeed="1"\r
-                               OptimizeForProcessor="3"\r
-                               AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
-                               RuntimeLibrary="0"\r
-                               BufferSecurityCheck="FALSE"\r
-                               EnableEnhancedInstructionSet="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="1"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="winmm.lib"\r
-                               OutputFile="$(OutDir)/speexenc.exe"\r
+                               AdditionalDependencies="winmm.lib libogg.lib"\r
+                               OutputFile="../../../bin/speexenc.exe"\r
                                LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libogg\lib"\r
                                GenerateDebugInformation="TRUE"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                RelativePath="..\..\..\src\getopt1.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\src\skeleton.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\src\speexenc.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\src\getopt_win.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\src\skeleton.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\src\wav_io.h">\r
                        </File>\r
                        <File\r
diff --git a/win32/VS2003/tests/Makefile.am b/win32/VS2003/tests/Makefile.am
new file mode 100644 (file)
index 0000000..47918c6
--- /dev/null
@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in. -*-Makefile-*-\r
+\r
+# Disable automatic dependency tracking if using other tools than gcc and gmake\r
+#AUTOMAKE_OPTIONS = no-dependencies\r
+\r
+EXTRA_DIST = testdenoise.vcproj testecho.vcproj testenc.vcproj testenc_uwb.vcproj \\r
+             testenc_wb.vcproj testresample.vcproj\r
+\r
+\r
diff --git a/win32/VS2003/tests/testdenoise.vcproj b/win32/VS2003/tests/testdenoise.vcproj
new file mode 100644 (file)
index 0000000..730df77
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testdenoise"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testdenoise.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testdenoise.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testdenoise.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testdenoise.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/VS2003/tests/testecho.vcproj b/win32/VS2003/tests/testecho.vcproj
new file mode 100644 (file)
index 0000000..0d12166
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testecho"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testecho.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testecho.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testecho.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testecho.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/VS2003/tests/testenc.vcproj b/win32/VS2003/tests/testenc.vcproj
new file mode 100644 (file)
index 0000000..42488f0
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testenc"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testenc.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/VS2003/tests/testenc_uwb.vcproj b/win32/VS2003/tests/testenc_uwb.vcproj
new file mode 100644 (file)
index 0000000..3178b52
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testenc_uwb"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_uwb.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_uwb.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_uwb.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testenc_uwb.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/VS2003/tests/testenc_wb.vcproj b/win32/VS2003/tests/testenc_wb.vcproj
new file mode 100644 (file)
index 0000000..472fc66
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testenc_wb"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_wb.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_wb.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testenc_wb.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testenc_wb.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/win32/VS2003/tests/testresample.vcproj b/win32/VS2003/tests/testresample.vcproj
new file mode 100644 (file)
index 0000000..e4e08e4
--- /dev/null
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="testresample"\r
+       ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"\r
+       Keyword="Win32Proj">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testresample.exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="$(OutDir)/speexenc.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testresample.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release_SSE|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="TRUE">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               GlobalOptimizations="TRUE"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="TRUE"\r
+                               FavorSizeOrSpeed="1"\r
+                               OptimizeForProcessor="2"\r
+                               AdditionalIncludeDirectories="..\..\..\include;..\.."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               StringPooling="TRUE"\r
+                               ExceptionHandling="FALSE"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="FALSE"\r
+                               EnableEnhancedInstructionSet="1"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="1"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               OutputFile="../../../bin/testresample.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               GenerateDebugInformation="TRUE"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="1"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\..\libspeex\testresample.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 673f9dc..2819e58 100644 (file)
@@ -1,3 +1,9 @@
+// Microsoft version of 'inline'\r
 #define inline __inline\r
-#define restrict\r
-#include "misc.h"
\ No newline at end of file
+\r
+// Visual Studio support alloca(), but it always align variables to 16-bit\r
+// boundary, while SSE need 128-bit alignment. So we disable alloca() when\r
+// SSE is enabled.\r
+#ifndef _USE_SSE\r
+#  define USE_ALLOCA\r
+#endif\r
index 47a8b5c..ff0c705 100644 (file)
@@ -42,7 +42,8 @@ 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 /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\r
+# ADD CPP /nologo /MD /GX /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /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
 BSC32=bscmake.exe\r
@@ -50,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
+# ADD LIB32 /nologo /out:"..\..\lib\libspeex.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "libspeex - Win32 Debug"\r
 \r
@@ -66,7 +67,8 @@ 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 /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /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
+# SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -74,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
+# ADD LIB32 /nologo /out:"..\..\lib\libspeex.lib"\r
 \r
 !ENDIF \r
 \r
@@ -119,6 +121,14 @@ 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
@@ -143,6 +153,22 @@ 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
@@ -163,6 +189,10 @@ SOURCE=..\..\libspeex\math_approx.c
 # 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
@@ -183,6 +213,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
@@ -211,22 +245,70 @@ 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
+\r
+SOURCE=..\..\libspeex\window.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # 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
+\r
 SOURCE=..\..\libspeex\cb_search.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\cb_search_sse.h\r
+# 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
 \r
+SOURCE=..\..\libspeex\filters_sse.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\fixed_debug.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\fixed_generic.h\r
+# 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
@@ -239,6 +321,14 @@ SOURCE=..\..\libspeex\ltp.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\ltp_sse.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\math_approx.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libspeex\misc.h\r
 # End Source File\r
 # Begin Source File\r
@@ -251,6 +341,10 @@ SOURCE=..\..\libspeex\nb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\pseudofloat.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libspeex\quant_lsp.h\r
 # End Source File\r
 # Begin Source File\r
@@ -263,27 +357,43 @@ SOURCE=..\..\libspeex\smallft.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex.h\r
+SOURCE=..\..\include\speex\speex.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_bits.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_callbacks.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_echo.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_header.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_bits.h\r
+SOURCE=..\..\include\speex\speex_jitter.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_callbacks.h\r
+SOURCE=..\..\include\speex\speex_preprocess.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_denoise.h\r
+SOURCE=..\..\include\speex\speex_resampler.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_header.h\r
+SOURCE=..\..\include\speex\speex_stereo.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_stereo.h\r
+SOURCE=..\..\include\speex\speex_types.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -295,8 +405,20 @@ SOURCE=..\..\libspeex\vbr.h
 # 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
+SOURCE=..\config.h\r
+# End Source File\r
 # End Target\r
 # End Project\r
index 5e00972..b9d24e5 100644 (file)
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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:"..\..\bin\libspeex.dll" /implib:"..\..\lib\libspeex.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "libspeex_dynamic - Win32 Debug"\r
 \r
@@ -69,7 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /GZ /c\r
+# SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -79,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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:"..\..\bin\libspeex.dll" /implib:"..\..\lib\libspeex.lib" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -124,6 +126,14 @@ 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
@@ -148,6 +158,22 @@ 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
@@ -168,6 +194,10 @@ SOURCE=..\..\libspeex\math_approx.c
 # 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
@@ -188,19 +218,19 @@ SOURCE=..\..\libspeex\quant_lsp.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\sb_celp.c\r
+SOURCE=..\..\libspeex\resample.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\smallft.c\r
+SOURCE=..\..\libspeex\sb_celp.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex.c\r
+SOURCE=..\..\libspeex\smallft.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\speex.def\r
+SOURCE=..\..\libspeex\speex.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -220,22 +250,70 @@ 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
+\r
+SOURCE=..\..\libspeex\window.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # 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
+\r
 SOURCE=..\..\libspeex\cb_search.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\cb_search_sse.h\r
+# 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
 \r
+SOURCE=..\..\libspeex\filters_sse.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\fixed_debug.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\fixed_generic.h\r
+# 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
@@ -248,6 +326,14 @@ SOURCE=..\..\libspeex\ltp.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\ltp_sse.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\libspeex\math_approx.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libspeex\misc.h\r
 # End Source File\r
 # Begin Source File\r
@@ -260,6 +346,10 @@ SOURCE=..\..\libspeex\nb_celp.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\libspeex\pseudofloat.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\libspeex\quant_lsp.h\r
 # End Source File\r
 # Begin Source File\r
@@ -272,27 +362,43 @@ SOURCE=..\..\libspeex\smallft.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex.h\r
+SOURCE=..\..\include\speex\speex.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_bits.h\r
+SOURCE=..\..\include\speex\speex_bits.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_callbacks.h\r
+SOURCE=..\..\include\speex\speex_callbacks.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_denoise.h\r
+SOURCE=..\..\include\speex\speex_echo.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_header.h\r
+SOURCE=..\..\include\speex\speex_header.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\libspeex\speex_stereo.h\r
+SOURCE=..\..\include\speex\speex_jitter.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_preprocess.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_resampler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_stereo.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\speex\speex_types.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -304,8 +410,24 @@ SOURCE=..\..\libspeex\vbr.h
 # 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
+SOURCE=..\config.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\speex.def\r
+# End Source File\r
 # End Target\r
 # End Project\r
index 94098a8..2dc28eb 100644 (file)
+LIBRARY libspeex
+EXPORTS
+
+
 ;
-; speex.def
+;      speex.h
 ;
-LIBRARY
-NAME libspeex.dll
-EXPORTS
+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_bits_advance @1
-speex_bits_destroy @2
-speex_bits_init @3
-speex_bits_init_buffer @4
-speex_bits_insert_terminator @5
-speex_bits_nbytes @6
-speex_bits_pack @7
-speex_bits_peek @8
-speex_bits_peek_unsigned @9
-speex_bits_read_from @10
-speex_bits_read_whole_bytes @11
-speex_bits_remaining @12
-speex_bits_reset @13
-speex_bits_rewind @14
-speex_bits_unpack_signed @15
-speex_bits_unpack_unsigned @16
-speex_bits_write @17
-speex_bits_write_whole_bytes @18
-speex_decode @19
-speex_decode_stereo @20
-speex_decoder_ctl @21
-speex_decoder_destroy @22
-speex_decoder_init @23
-speex_default_user_handler @24
-speex_encode @25
-speex_encode_stereo @26
-speex_encoder_ctl @27
-speex_encoder_destroy @28
-speex_encoder_init @29
-speex_header_to_packet @30
-speex_inband_handler @31
-speex_init_header @32
-speex_lib_ctl @33
-speex_mode_query @34
-speex_packet_to_header @35
-speex_std_char_handler @36
-speex_std_enh_request_handler @37
-speex_std_high_mode_request_handler @38
-speex_std_low_mode_request_handler @39
-speex_std_mode_request_handler @40
-speex_std_stereo_request_handler @41
-speex_std_vbr_quality_request_handler @42
-speex_std_vbr_request_handler @43
-speex_decode_int @44
-speex_decode_stereo_int @45
-speex_echo_cancel @46
-speex_echo_state_destroy @47
-speex_echo_state_init @48
-speex_echo_state_reset @49
-speex_encode_int @50
-speex_encode_stereo_int @51
-speex_jitter_destroy @52
-speex_jitter_get @53
-speex_jitter_get_pointer_timestamp @54
-speex_jitter_init @55
-speex_jitter_put @56
-speex_lib_get_mode @57
-speex_preprocess @58
-speex_preprocess_ctl @59
-speex_preprocess_estimate_update @60
-speex_preprocess_state_destroy @61
-speex_preprocess_state_init @62
-speex_nb_mode @63 DATA
-speex_wb_mode @64 DATA
-speex_uwb_mode @65 DATA
+speex_encode_stereo
+speex_encode_stereo_int
+speex_decode_stereo
+speex_decode_stereo_int
+speex_std_stereo_request_handler
old mode 100755 (executable)
new mode 100644 (file)
index 64fcd46..10b732d 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /GX /O2 /I "../../libspeex" /I "../../../ogg/include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /MD /GX /O2 /I "../../../libogg/include" /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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" /out:"../../bin/speexdec.exe"\r
 \r
 !ELSEIF  "$(CFG)" == "speexdec - Win32 Debug"\r
 \r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# 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\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../libogg/include" /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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 /out:"../../bin/speexdec.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
index 37f2d1f..a7de362 100644 (file)
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ogg_static"="..\..\..\MYOV-1.0\ogg\win32\ogg_static.dsp" - Package Owner=<4>\r
+Project: "ogg_static"="..\..\..\libogg\win32\ogg_static.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
index 4b9dd89..eeae18e 100644 (file)
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# ADD CPP /nologo /MD /GX /Ox /Ot /Og /Oi /Ob2 /I "../" /I "../../include" /I "../../../libogg/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"  /out:"../../bin/speexenc.exe"\r
 \r
 !ELSEIF  "$(CFG)" == "speexenc - Win32 Debug"\r
 \r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# 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\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../include" /I "../../../libogg/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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 /out:"../../bin/speexenc.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -95,6 +95,10 @@ SOURCE=..\..\src\getopt1.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\skeleton.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\speexenc.c\r
 # End Source File\r
 # Begin Source File\r
@@ -111,6 +115,10 @@ SOURCE=..\..\src\getopt_win.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\skeleton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\wav_io.h\r
 # End Source File\r
 # End Group\r
index 55aa72d..525fa5d 100644 (file)
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ogg_static"="..\..\..\MYOV-1.0\ogg\win32\ogg_static.dsp" - Package Owner=<4>\r
+Project: "ogg_static"="..\..\..\libogg\win32\ogg_static.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r