[xiph-commits] r14157 - in trunk/speex/win32: . VS2003
VS2003/libspeex libspeex speexenc
jm at svn.xiph.org
jm at svn.xiph.org
Thu Nov 15 14:34:29 PST 2007
Author: jm
Date: 2007-11-15 14:34:28 -0800 (Thu, 15 Nov 2007)
New Revision: 14157
Removed:
trunk/speex/win32/VS2003/libspeex/libspeex.def
trunk/speex/win32/libspeex/speex.def
Modified:
trunk/speex/win32/Makefile.am
trunk/speex/win32/VS2003/Makefile.am
trunk/speex/win32/VS2003/libspeex.sln
trunk/speex/win32/VS2003/libspeex/Makefile.am
trunk/speex/win32/VS2003/libspeex/libspeex.vcproj
trunk/speex/win32/config.h
trunk/speex/win32/libspeex/Makefile.am
trunk/speex/win32/libspeex/libspeex.dsp
trunk/speex/win32/libspeex/libspeex.dsw
trunk/speex/win32/libspeex/libspeex_dynamic.dsp
trunk/speex/win32/speexenc/speexenc.dsw
Log:
Update to Windows project files by Alexander Chemeris.
Modified: trunk/speex/win32/Makefile.am
===================================================================
--- trunk/speex/win32/Makefile.am 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/Makefile.am 2007-11-15 22:34:28 UTC (rev 14157)
@@ -5,4 +5,4 @@
SUBDIRS = libspeex speexenc speexdec VS2003 VS2005
-EXTRA_DIST = speex.iss config.h
+EXTRA_DIST = speex.iss config.h libspeex.def libspeexdsp.def
Modified: trunk/speex/win32/VS2003/Makefile.am
===================================================================
--- trunk/speex/win32/VS2003/Makefile.am 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/VS2003/Makefile.am 2007-11-15 22:34:28 UTC (rev 14157)
@@ -3,6 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
-SUBDIRS = libspeex speexenc speexdec tests
+SUBDIRS = libspeex libspeexdsp speexenc speexdec tests
EXTRA_DIST = libspeex.sln
Modified: trunk/speex/win32/VS2003/libspeex/Makefile.am
===================================================================
--- trunk/speex/win32/VS2003/libspeex/Makefile.am 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/VS2003/libspeex/Makefile.am 2007-11-15 22:34:28 UTC (rev 14157)
@@ -3,6 +3,6 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
-EXTRA_DIST = libspeex.def libspeex.vcproj
+EXTRA_DIST = libspeex.vcproj
Deleted: trunk/speex/win32/VS2003/libspeex/libspeex.def
===================================================================
--- trunk/speex/win32/VS2003/libspeex/libspeex.def 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/VS2003/libspeex/libspeex.def 2007-11-15 22:34:28 UTC (rev 14157)
@@ -1,135 +0,0 @@
-LIBRARY libspeex
-EXPORTS
-
-
-;
-; speex.h
-;
-speex_encoder_init
-speex_encoder_destroy
-speex_encode
-speex_encode_int
-speex_encoder_ctl
-speex_decoder_init
-speex_decoder_destroy
-speex_decode
-speex_decode_int
-speex_decoder_ctl
-speex_mode_query
-speex_lib_ctl
-speex_lib_get_mode
-
-;
-; speex_bits.h
-;
-speex_bits_init
-speex_bits_init_buffer
-speex_bits_set_bit_buffer
-speex_bits_destroy
-speex_bits_reset
-speex_bits_rewind
-speex_bits_read_from
-speex_bits_read_whole_bytes
-speex_bits_write
-speex_bits_write_whole_bytes
-speex_bits_pack
-speex_bits_unpack_signed
-speex_bits_unpack_unsigned
-speex_bits_nbytes
-speex_bits_peek_unsigned
-speex_bits_peek
-speex_bits_advance
-speex_bits_remaining
-speex_bits_insert_terminator
-
-;
-; speex_callbacks.h
-;
-speex_inband_handler
-speex_std_mode_request_handler
-speex_std_high_mode_request_handler
-speex_std_char_handler
-speex_default_user_handler
-speex_std_low_mode_request_handler
-speex_std_vbr_request_handler
-speex_std_enh_request_handler
-speex_std_vbr_quality_request_handler
-
-;
-; speex_echo.h
-;
-speex_echo_state_init
-speex_echo_state_destroy
-speex_echo_cancellation
-speex_echo_cancel
-speex_echo_capture
-speex_echo_playback
-speex_echo_state_reset
-speex_echo_ctl
-
-;
-; speex_header.h
-;
-speex_init_header
-speex_header_to_packet
-speex_packet_to_header
-
-;
-; speex_jitter.h
-;
-jitter_buffer_init
-jitter_buffer_reset
-jitter_buffer_destroy
-jitter_buffer_put
-jitter_buffer_get
-jitter_buffer_get_pointer_timestamp
-jitter_buffer_tick
-jitter_buffer_update_delay
-speex_jitter_init
-speex_jitter_destroy
-speex_jitter_put
-speex_jitter_get
-speex_jitter_get_pointer_timestamp
-
-;
-; speex_preprocess.h
-;
-speex_preprocess_state_init
-speex_preprocess_state_destroy
-speex_preprocess_run
-speex_preprocess
-speex_preprocess_estimate_update
-speex_preprocess_ctl
-
-;
-; speex_resampler.h
-;
-speex_resampler_init
-speex_resampler_init_frac
-speex_resampler_destroy
-speex_resampler_process_float
-speex_resampler_process_int
-speex_resampler_process_interleaved_float
-speex_resampler_process_interleaved_int
-speex_resampler_set_rate
-speex_resampler_get_rate
-speex_resampler_set_rate_frac
-speex_resampler_get_ratio
-speex_resampler_set_quality
-speex_resampler_get_quality
-speex_resampler_set_input_stride
-speex_resampler_get_input_stride
-speex_resampler_set_output_stride
-speex_resampler_get_output_stride
-speex_resampler_skip_zeros
-speex_resampler_reset_mem
-speex_resampler_strerror
-
-;
-; speex_stereo.h
-;
-speex_encode_stereo
-speex_encode_stereo_int
-speex_decode_stereo
-speex_decode_stereo_int
-speex_std_stereo_request_handler
Modified: trunk/speex/win32/VS2003/libspeex/libspeex.vcproj
===================================================================
--- trunk/speex/win32/VS2003/libspeex/libspeex.vcproj 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/VS2003/libspeex/libspeex.vcproj 2007-11-15 22:34:28 UTC (rev 14157)
@@ -25,7 +25,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- WarningLevel="4"
+ WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
CompileAs="1"/>
@@ -74,9 +74,8 @@
ExceptionHandling="FALSE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
- EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
- WarningLevel="4"
+ WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
CompileAs="1"
@@ -173,14 +172,14 @@
FavorSizeOrSpeed="1"
OptimizeForProcessor="3"
AdditionalIncludeDirectories="..\..\..\include;..\.."
- PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"
+ PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
- WarningLevel="4"
+ WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
CompileAs="1"
@@ -190,7 +189,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="../../../bin/libspeex.dll"
- ModuleDefinitionFile="libspeex.def"
+ ModuleDefinitionFile="..\..\libspeex.def"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
@@ -249,12 +248,6 @@
RelativePath="..\..\..\libspeex\exc_8_128_table.c">
</File>
<File
- RelativePath="..\..\..\libspeex\fftwrap.c">
- </File>
- <File
- RelativePath="..\..\..\libspeex\filterbank.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\filters.c">
</File>
<File
@@ -273,18 +266,6 @@
RelativePath="..\..\..\libspeex\high_lsp_tables.c">
</File>
<File
- RelativePath="..\..\..\libspeex\jitter.c">
- </File>
- <File
- RelativePath="..\..\..\libspeex\kiss_fft.c">
- </File>
- <File
- RelativePath="..\..\..\libspeex\kiss_fftr.c">
- </File>
- <File
- RelativePath="..\..\..\libspeex\lbr_48k_tables.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\lpc.c">
</File>
<File
@@ -297,36 +278,21 @@
RelativePath="..\..\..\libspeex\ltp.c">
</File>
<File
- RelativePath="..\..\..\libspeex\math_approx.c">
+ RelativePath="..\..\..\libspeex\modes.c">
</File>
<File
- RelativePath="..\..\..\libspeex\mdf.c">
+ RelativePath="..\..\..\libspeex\modes_wb.c">
</File>
<File
- RelativePath="..\..\..\libspeex\misc.c">
- </File>
- <File
- RelativePath="..\..\..\libspeex\modes.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\nb_celp.c">
</File>
<File
- RelativePath="..\..\..\libspeex\preprocess.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\quant_lsp.c">
</File>
<File
- RelativePath="..\..\..\libspeex\resample.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\sb_celp.c">
</File>
<File
- RelativePath="..\..\..\libspeex\smallft.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\speex.c">
</File>
<File
@@ -342,9 +308,6 @@
RelativePath="..\..\..\libspeex\vbr.c">
</File>
<File
- RelativePath="..\..\..\libspeex\vorbis_psy.c">
- </File>
- <File
RelativePath="..\..\..\libspeex\vq.c">
</File>
<File
@@ -356,9 +319,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
- RelativePath="..\..\..\libspeex\_kiss_fft_guts.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\arch.h">
</File>
<File
@@ -368,15 +328,6 @@
RelativePath="..\..\..\libspeex\cb_search_sse.h">
</File>
<File
- RelativePath="..\..\config.h">
- </File>
- <File
- RelativePath="..\..\..\libspeex\fftwrap.h">
- </File>
- <File
- RelativePath="..\..\..\libspeex\filterbank.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\filters.h">
</File>
<File
@@ -389,12 +340,6 @@
RelativePath="..\..\..\libspeex\fixed_generic.h">
</File>
<File
- RelativePath="..\..\..\libspeex\kiss_fft.h">
- </File>
- <File
- RelativePath="..\..\..\libspeex\kiss_fftr.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\lpc.h">
</File>
<File
@@ -410,16 +355,13 @@
RelativePath="..\..\..\libspeex\math_approx.h">
</File>
<File
- RelativePath="..\..\..\libspeex\misc.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\modes.h">
</File>
<File
RelativePath="..\..\..\libspeex\nb_celp.h">
</File>
<File
- RelativePath="..\..\..\libspeex\pseudofloat.h">
+ RelativePath="..\..\..\libspeex\os_support.h">
</File>
<File
RelativePath="..\..\..\libspeex\quant_lsp.h">
@@ -428,18 +370,12 @@
RelativePath="..\..\..\libspeex\sb_celp.h">
</File>
<File
- RelativePath="..\..\..\libspeex\smallft.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\stack_alloc.h">
</File>
<File
RelativePath="..\..\..\libspeex\vbr.h">
</File>
<File
- RelativePath="..\..\..\libspeex\vorbis_psy.h">
- </File>
- <File
RelativePath="..\..\..\libspeex\vq.h">
</File>
<File
@@ -447,11 +383,6 @@
</File>
</Filter>
<Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- </Filter>
- <Filter
Name="Public Header Files"
Filter="">
<File
@@ -464,30 +395,26 @@
RelativePath="..\..\..\include\speex\speex_callbacks.h">
</File>
<File
- RelativePath="..\..\..\include\speex\speex_echo.h">
- </File>
- <File
RelativePath="..\..\..\include\speex\speex_header.h">
</File>
<File
- RelativePath="..\..\..\include\speex\speex_jitter.h">
- </File>
- <File
- RelativePath="..\..\..\include\speex\speex_preprocess.h">
- </File>
- <File
- RelativePath="..\..\..\include\speex\speex_resampler.h">
- </File>
- <File
RelativePath="..\..\..\include\speex\speex_stereo.h">
</File>
<File
RelativePath="..\..\..\include\speex\speex_types.h">
</File>
</Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
<File
- RelativePath=".\libspeex.def">
+ RelativePath="..\..\config.h">
</File>
+ <File
+ RelativePath="..\..\libspeex.def">
+ </File>
</Files>
<Globals>
</Globals>
Modified: trunk/speex/win32/VS2003/libspeex.sln
===================================================================
--- trunk/speex/win32/VS2003/libspeex.sln 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/VS2003/libspeex.sln 2007-11-15 22:34:28 UTC (rev 14157)
@@ -11,16 +11,17 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexenc", "speexenc\speexenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"
ProjectSection(ProjectDependencies) = postProject
{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"
ProjectSection(ProjectDependencies) = postProject
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}"
ProjectSection(ProjectDependencies) = postProject
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"
@@ -40,9 +41,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"
ProjectSection(ProjectDependencies) = postProject
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -68,6 +73,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32
@@ -75,6 +81,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.ActiveCfg = Release|Win32
@@ -82,6 +89,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.ActiveCfg = Release|Win32
@@ -89,6 +97,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.ActiveCfg = Release|Win32
@@ -104,6 +113,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.ActiveCfg = Release|Win32
@@ -111,6 +121,7 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.ActiveCfg = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.Build.0 = Debug|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.ActiveCfg = Release|Win32
@@ -118,6 +129,15 @@
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32
{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32
+ {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.Build.0 = Release_SSE|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.ActiveCfg = Debug|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.Build.0 = Debug|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.ActiveCfg = Release|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.Build.0 = Release|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32
+ {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: trunk/speex/win32/config.h
===================================================================
--- trunk/speex/win32/config.h 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/config.h 2007-11-15 22:34:28 UTC (rev 14157)
@@ -9,4 +9,6 @@
#endif
/* Default to floating point */
-#define FLOATING_POINT
+#ifndef FIXED_POINT
+# define FLOATING_POINT
+#endif
Modified: trunk/speex/win32/libspeex/Makefile.am
===================================================================
--- trunk/speex/win32/libspeex/Makefile.am 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/libspeex/Makefile.am 2007-11-15 22:34:28 UTC (rev 14157)
@@ -3,4 +3,4 @@
# Disable automatic dependency tracking if using other tools than gcc and gmake
#AUTOMAKE_OPTIONS = no-dependencies
-EXTRA_DIST = libspeex.dsp libspeex.dsw libspeex_dynamic.dsp speex.def
+EXTRA_DIST = libspeex.dsw libspeex.dsp libspeex_dynamic.dsp libspeexdsp.dsp libspeexdsp_dynamic.dsp
Modified: trunk/speex/win32/libspeex/libspeex.dsp
===================================================================
--- trunk/speex/win32/libspeex/libspeex.dsp 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/libspeex/libspeex.dsp 2007-11-15 22:34:28 UTC (rev 14157)
@@ -42,7 +42,7 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /GX /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c
+# ADD CPP /nologo /MD /GX- /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
@@ -67,7 +67,7 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Od /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX- /Zi /Od /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -121,14 +121,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\fftwrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filterbank.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\filters.c
# End Source File
# Begin Source File
@@ -153,22 +145,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fftr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\lpc.c
# End Source File
# Begin Source File
@@ -185,46 +161,26 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\math_approx.c
+SOURCE=..\..\libspeex\modes.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\mdf.c
+SOURCE=..\..\libspeex\modes_wb.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\nb_celp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\quant_lsp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\resample.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\sb_celp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\speex.c
# End Source File
# Begin Source File
@@ -245,10 +201,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\vorbis_psy.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\vq.c
# End Source File
# Begin Source File
@@ -261,10 +213,6 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\libspeex\_kiss_fft_guts.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\arch.h
# End Source File
# Begin Source File
@@ -277,14 +225,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\fftwrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filterbank.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\filters.h
# End Source File
# Begin Source File
@@ -301,14 +241,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\kiss_fft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fftr.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\lpc.h
# End Source File
# Begin Source File
@@ -329,10 +261,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\modes.h
# End Source File
# Begin Source File
@@ -341,7 +269,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\pseudofloat.h
+SOURCE=..\..\libspeex\os_support.h
# End Source File
# Begin Source File
@@ -353,39 +281,39 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\smallft.h
+SOURCE=..\..\libspeex\stack_alloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex.h
+SOURCE=..\..\libspeex\vbr.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_bits.h
+SOURCE=..\..\libspeex\vq.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_callbacks.h
+SOURCE=..\..\libspeex\vq_sse.h
# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Public Header Files"
-SOURCE=..\..\include\speex\speex_echo.h
-# End Source File
+# PROP Default_Filter "*.h"
# Begin Source File
-SOURCE=..\..\include\speex\speex_header.h
+SOURCE=..\..\include\speex\speex.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_jitter.h
+SOURCE=..\..\include\speex\speex_bits.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_preprocess.h
+SOURCE=..\..\include\speex\speex_callbacks.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_resampler.h
+SOURCE=..\..\include\speex\speex_header.h
# End Source File
# Begin Source File
@@ -395,26 +323,6 @@
SOURCE=..\..\include\speex\speex_types.h
# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vorbis_psy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq_sse.h
-# End Source File
# End Group
# Begin Source File
Modified: trunk/speex/win32/libspeex/libspeex.dsw
===================================================================
--- trunk/speex/win32/libspeex/libspeex.dsw 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/libspeex/libspeex.dsw 2007-11-15 22:34:28 UTC (rev 14157)
@@ -27,6 +27,30 @@
###############################################################################
+Project: "libspeexdsp"=.\libspeexdsp.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libspeexdsp_dynamic"=.\libspeexdsp_dynamic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
Modified: trunk/speex/win32/libspeex/libspeex_dynamic.dsp
===================================================================
--- trunk/speex/win32/libspeex/libspeex_dynamic.dsp 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/libspeex/libspeex_dynamic.dsp 2007-11-15 22:34:28 UTC (rev 14157)
@@ -91,7 +91,7 @@
# Name "libspeex_dynamic - Win32 Debug"
# Begin Group "Source Files"
-# PROP Default_Filter ""
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\libspeex\bits.c
@@ -126,14 +126,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\fftwrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filterbank.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\filters.c
# End Source File
# Begin Source File
@@ -158,22 +150,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\jitter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fft.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fftr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\lbr_48k_tables.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\lpc.c
# End Source File
# Begin Source File
@@ -190,46 +166,26 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\math_approx.c
+SOURCE=..\..\libspeex\modes.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\mdf.c
+SOURCE=..\..\libspeex\modes_wb.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\modes.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\nb_celp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\preprocess.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\quant_lsp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\resample.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\sb_celp.c
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\smallft.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\speex.c
# End Source File
# Begin Source File
@@ -250,10 +206,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\vorbis_psy.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\vq.c
# End Source File
# Begin Source File
@@ -266,10 +218,6 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\libspeex\_kiss_fft_guts.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\arch.h
# End Source File
# Begin Source File
@@ -282,14 +230,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\fftwrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\filterbank.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\filters.h
# End Source File
# Begin Source File
@@ -306,14 +246,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\kiss_fft.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\kiss_fftr.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\lpc.h
# End Source File
# Begin Source File
@@ -334,10 +266,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\misc.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\libspeex\modes.h
# End Source File
# Begin Source File
@@ -346,7 +274,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\pseudofloat.h
+SOURCE=..\..\libspeex\os_support.h
# End Source File
# Begin Source File
@@ -358,39 +286,39 @@
# End Source File
# Begin Source File
-SOURCE=..\..\libspeex\smallft.h
+SOURCE=..\..\libspeex\stack_alloc.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex.h
+SOURCE=..\..\libspeex\vbr.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_bits.h
+SOURCE=..\..\libspeex\vq.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_callbacks.h
+SOURCE=..\..\libspeex\vq_sse.h
# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Public Header Files"
-SOURCE=..\..\include\speex\speex_echo.h
-# End Source File
+# PROP Default_Filter "*.h"
# Begin Source File
-SOURCE=..\..\include\speex\speex_header.h
+SOURCE=..\..\include\speex\speex.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_jitter.h
+SOURCE=..\..\include\speex\speex_bits.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_preprocess.h
+SOURCE=..\..\include\speex\speex_callbacks.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\speex\speex_resampler.h
+SOURCE=..\..\include\speex\speex_header.h
# End Source File
# Begin Source File
@@ -400,26 +328,6 @@
SOURCE=..\..\include\speex\speex_types.h
# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\stack_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vorbis_psy.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\libspeex\vq_sse.h
-# End Source File
# End Group
# Begin Source File
@@ -427,7 +335,7 @@
# End Source File
# Begin Source File
-SOURCE=.\speex.def
+SOURCE=..\libspeex.def
# End Source File
# End Target
# End Project
Deleted: trunk/speex/win32/libspeex/speex.def
===================================================================
--- trunk/speex/win32/libspeex/speex.def 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/libspeex/speex.def 2007-11-15 22:34:28 UTC (rev 14157)
@@ -1,135 +0,0 @@
-LIBRARY libspeex
-EXPORTS
-
-
-;
-; speex.h
-;
-speex_encoder_init
-speex_encoder_destroy
-speex_encode
-speex_encode_int
-speex_encoder_ctl
-speex_decoder_init
-speex_decoder_destroy
-speex_decode
-speex_decode_int
-speex_decoder_ctl
-speex_mode_query
-speex_lib_ctl
-speex_lib_get_mode
-
-;
-; speex_bits.h
-;
-speex_bits_init
-speex_bits_init_buffer
-speex_bits_set_bit_buffer
-speex_bits_destroy
-speex_bits_reset
-speex_bits_rewind
-speex_bits_read_from
-speex_bits_read_whole_bytes
-speex_bits_write
-speex_bits_write_whole_bytes
-speex_bits_pack
-speex_bits_unpack_signed
-speex_bits_unpack_unsigned
-speex_bits_nbytes
-speex_bits_peek_unsigned
-speex_bits_peek
-speex_bits_advance
-speex_bits_remaining
-speex_bits_insert_terminator
-
-;
-; speex_callbacks.h
-;
-speex_inband_handler
-speex_std_mode_request_handler
-speex_std_high_mode_request_handler
-speex_std_char_handler
-speex_default_user_handler
-speex_std_low_mode_request_handler
-speex_std_vbr_request_handler
-speex_std_enh_request_handler
-speex_std_vbr_quality_request_handler
-
-;
-; speex_echo.h
-;
-speex_echo_state_init
-speex_echo_state_destroy
-speex_echo_cancellation
-speex_echo_cancel
-speex_echo_capture
-speex_echo_playback
-speex_echo_state_reset
-speex_echo_ctl
-
-;
-; speex_header.h
-;
-speex_init_header
-speex_header_to_packet
-speex_packet_to_header
-
-;
-; speex_jitter.h
-;
-jitter_buffer_init
-jitter_buffer_reset
-jitter_buffer_destroy
-jitter_buffer_put
-jitter_buffer_get
-jitter_buffer_get_pointer_timestamp
-jitter_buffer_tick
-jitter_buffer_update_delay
-speex_jitter_init
-speex_jitter_destroy
-speex_jitter_put
-speex_jitter_get
-speex_jitter_get_pointer_timestamp
-
-;
-; speex_preprocess.h
-;
-speex_preprocess_state_init
-speex_preprocess_state_destroy
-speex_preprocess_run
-speex_preprocess
-speex_preprocess_estimate_update
-speex_preprocess_ctl
-
-;
-; speex_resampler.h
-;
-speex_resampler_init
-speex_resampler_init_frac
-speex_resampler_destroy
-speex_resampler_process_float
-speex_resampler_process_int
-speex_resampler_process_interleaved_float
-speex_resampler_process_interleaved_int
-speex_resampler_set_rate
-speex_resampler_get_rate
-speex_resampler_set_rate_frac
-speex_resampler_get_ratio
-speex_resampler_set_quality
-speex_resampler_get_quality
-speex_resampler_set_input_stride
-speex_resampler_get_input_stride
-speex_resampler_set_output_stride
-speex_resampler_get_output_stride
-speex_resampler_skip_zeros
-speex_resampler_reset_mem
-speex_resampler_strerror
-
-;
-; speex_stereo.h
-;
-speex_encode_stereo
-speex_encode_stereo_int
-speex_decode_stereo
-speex_decode_stereo_int
-speex_std_stereo_request_handler
Modified: trunk/speex/win32/speexenc/speexenc.dsw
===================================================================
--- trunk/speex/win32/speexenc/speexenc.dsw 2007-11-15 22:33:58 UTC (rev 14156)
+++ trunk/speex/win32/speexenc/speexenc.dsw 2007-11-15 22:34:28 UTC (rev 14157)
@@ -15,7 +15,7 @@
###############################################################################
-Project: "ogg_static"="..\..\..\libogg\win32\ogg_static.dsp" - Package Owner=<4>
+Project: "libspeexdsp"=..\libspeex\libspeexdsp.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -27,6 +27,18 @@
###############################################################################
+Project: "ogg_static"=..\..\..\libogg\win32\ogg_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "speexenc"=.\speexenc.dsp - Package Owner=<4>
Package=<5>
@@ -41,6 +53,9 @@
Begin Project Dependency
Project_Dep_Name ogg_static
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libspeexdsp
+ End Project Dependency
}}}
###############################################################################
More information about the commits
mailing list