kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libbroadvoice some partial corrections for windows build 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15557 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Jeff Lenk 2009-11-19 20:40:56 +00:00
parent e053e06929
commit c1c132908d
3 changed files with 251 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/broadvoice/src/Makefile.am
View File

@ -114,7 +114,7 @@ noinst_PROGRAMS =
DSP = broadvoice.dsp DSP = broadvoice.dsp
VCPROJ = broadvoice.vcproj VCPROJ = broadvoice.vcproj
WIN32SOURCES = $(broadvoice_la_SOURCES) msvc/gettimeofday.c WIN32SOURCES = $(libbroadvoice_la_SOURCES) msvc/gettimeofday.c
WIN32HEADERS = $(nobase_include_HEADERS) broadvoice.h WIN32HEADERS = $(nobase_include_HEADERS) broadvoice.h
DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP) DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)

429
libs/broadvoice/src/broadvoice.vcproj
View File

@ -1,189 +1,246 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="libg722_1" Name="libbroadvoice"
ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
RootNamespace="libg722_1" RootNamespace="libbroadvoice"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
Name="Win32" Name="Win32"
/> />
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="1" CharacterSet="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
<Tool <Tool
Name="VCWebServiceProxyGeneratorTool" Name="VCWebServiceProxyGeneratorTool"
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src; src\g722_1; src\msvc" AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
DebugInformationFormat="4" DebugInformationFormat="4"
CompileAs="1" CompileAs="1"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="2" LinkIncremental="2"
ModuleDefinitionFile="src/msvc/g722_1.def" GenerateDebugInformation="true"
GenerateDebugInformation="true" SubSystem="2"
SubSystem="2" RandomizedBaseAddress="1"
RandomizedBaseAddress="1" DataExecutionPrevention="0"
DataExecutionPrevention="0" TargetMachine="1"
TargetMachine="1" />
/> <Tool
<Tool Name="VCALinkTool"
Name="VCALinkTool" />
/> <Tool
<Tool Name="VCManifestTool"
Name="VCManifestTool" />
/> <Tool
<Tool Name="VCXDCMakeTool"
Name="VCXDCMakeTool" />
/> <Tool
<Tool Name="VCBscMakeTool"
Name="VCBscMakeTool" />
/> <Tool
<Tool Name="VCFxCopTool"
Name="VCFxCopTool" />
/> <Tool
<Tool Name="VCAppVerifierTool"
Name="VCAppVerifierTool" />
/> <Tool
<Tool Name="VCPostBuildEventTool"
Name="VCPostBuildEventTool" />
/> </Configuration>
</Configuration> <Configuration
<Configuration Name="Release|Win32"
Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2"
ConfigurationType="2" CharacterSet="1"
CharacterSet="1" WholeProgramOptimization="1"
WholeProgramOptimization="1" >
> <Tool
<Tool Name="VCPreBuildEventTool"
Name="VCPreBuildEventTool" />
/> <Tool
<Tool Name="VCCustomBuildTool"
Name="VCCustomBuildTool" />
/> <Tool
<Tool Name="VCXMLDataGeneratorTool"
Name="VCXMLDataGeneratorTool" />
/> <Tool
<Tool Name="VCWebServiceProxyGeneratorTool"
Name="VCWebServiceProxyGeneratorTool" />
/> <Tool
<Tool Name="VCMIDLTool"
Name="VCMIDLTool" />
/> <Tool
<Tool Name="VCCLCompilerTool"
Name="VCCLCompilerTool" AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc"
AdditionalIncludeDirectories="src; src\g722_1; src\msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H" RuntimeLibrary="2"
RuntimeLibrary="2" UsePrecompiledHeader="0"
UsePrecompiledHeader="0" WarningLevel="4"
WarningLevel="4" Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="true" DebugInformationFormat="3"
DebugInformationFormat="3" />
/> <Tool
<Tool Name="VCManagedResourceCompilerTool"
Name="VCManagedResourceCompilerTool" />
/> <Tool
<Tool Name="VCResourceCompilerTool"
Name="VCResourceCompilerTool" />
/> <Tool
<Tool Name="VCPreLinkEventTool"
Name="VCPreLinkEventTool" />
/> <Tool
<Tool Name="VCLinkerTool"
Name="VCLinkerTool" LinkIncremental="1"
LinkIncremental="1" GenerateDebugInformation="true"
ModuleDefinitionFile="src/msvc/g722_1.def" SubSystem="2"
GenerateDebugInformation="true" OptimizeReferences="2"
SubSystem="2" EnableCOMDATFolding="2"
OptimizeReferences="2" RandomizedBaseAddress="1"
EnableCOMDATFolding="2" DataExecutionPrevention="0"
RandomizedBaseAddress="1" TargetMachine="1"
DataExecutionPrevention="0" />
TargetMachine="1" <Tool
/> Name="VCALinkTool"
<Tool />
Name="VCALinkTool" <Tool
/> Name="VCManifestTool"
<Tool />
Name="VCManifestTool" <Tool
/> Name="VCXDCMakeTool"
<Tool />
Name="VCXDCMakeTool" <Tool
/> Name="VCBscMakeTool"
<Tool />
Name="VCBscMakeTool" <Tool
/> Name="VCFxCopTool"
<Tool />
Name="VCFxCopTool" <Tool
/> Name="VCAppVerifierTool"
<Tool />
Name="VCAppVerifierTool" <Tool
/> Name="VCPostBuildEventTool"
<Tool />
Name="VCPostBuildEventTool" </Configuration>
/> </Configurations>
</Configuration> <References>
</Configurations> </References>
<References> <Files>
</References> <Filter
<Files> Name="Source Files"
<Filter Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
Name="Source Files" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" >
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" <File RelativePath="bitpack16.c"></File>
> <File RelativePath="bitpack32.c"></File>
<File RelativePath="msvc/gettimeofday.c"></File> <File RelativePath="bitstream.c"></File>
</Filter><Filter Name="Header Files"> <File RelativePath="floating\bv16\bv16coarse_pitch.c"></File>
<File RelativePath="broadvoice/broadvoice.h"></File> <File RelativePath="floating\bv16\bv16decoder.c"></File>
<File RelativePath="broadvoice/version.h"></File> <File RelativePath="floating\bv16\bv16encoder.c"></File>
<File RelativePath="broadvoice/private/broadvoice.h"></File> <File RelativePath="floating\bv16\bv16excdec.c"></File>
<File RelativePath="broadvoice.h"></File> <File RelativePath="floating\bv16\bv16excquan.c"></File>
<File RelativePath="floating\bv16\bv16fine_pitch.c"></File>
<File RelativePath="floating\bv16\bv16gaindec.c"></File>
<File RelativePath="floating\bv16\bv16gainquan.c"></File>
<File RelativePath="floating\bv16\bv16levelest.c"></File>
<File RelativePath="floating\bv16\bv16lspdec.c"></File>
<File RelativePath="floating\bv16\bv16lspquan.c"></File>
<File RelativePath="floating\bv16\bv16plc.c"></File>
<File RelativePath="floating\bv16\bv16postfilter.c"></File>
<File RelativePath="floating\bv16\bv16ptdec.c"></File>
<File RelativePath="floating\bv16\bv16ptquan.c"></File>
<File RelativePath="floating\bv16\bv16tables.c"></File>
<File RelativePath="floating\bv32\bv32coarse_pitch.c"></File>
<File RelativePath="floating\bv32\bv32decoder.c"></File>
<File RelativePath="floating\bv32\bv32encoder.c"></File>
<File RelativePath="floating\bv32\bv32excdec.c"></File>
<File RelativePath="floating\bv32\bv32excquan.c"></File>
<File RelativePath="floating\bv32\bv32fine_pitch.c"></File>
<File RelativePath="floating\bv32\bv32gaindec.c"></File>
<File RelativePath="floating\bv32\bv32gainquan.c"></File>
<File RelativePath="floating\bv32\bv32levelest.c"></File>
<File RelativePath="floating\bv32\bv32lspdec.c"></File>
<File RelativePath="floating\bv32\bv32lspquan.c"></File>
<File RelativePath="floating\bv32\bv32plc.c"></File>
<File RelativePath="floating\bv32\bv32ptdec.c"></File>
<File RelativePath="floating\bv32\bv32ptquan.c"></File>
<File RelativePath="floating\bv32\bv32tables.c"></File>
<File RelativePath="floating\common\a2lsp.c"></File>
<File RelativePath="floating\common\allpole.c"></File>
<File RelativePath="floating\common\allzero.c"></File>
<File RelativePath="floating\common\autocor.c"></File>
<File RelativePath="floating\common\cmtables.c"></File>
<File RelativePath="floating\common\levdur.c"></File>
<File RelativePath="floating\common\lsp2a.c"></File>
<File RelativePath="floating\common\stblchck.c"></File>
<File RelativePath="floating\common\stblzlsp.c"></File>
<File RelativePath="floating\common\utility.c"></File>
<File RelativePath="msvc\gettimeofday.c"></File>
</Filter>
<Filter
Name="Header Files"
>
<File
RelativePath="broadvoice.h"
>
</File>
<File
RelativePath="broadvoice/broadvoice.h"
>
</File>
<File
RelativePath="broadvoice/private/broadvoice.h"
>
</File>
<File
RelativePath="broadvoice/version.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

16
libs/broadvoice/src/msvc/vc8proj.head
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="libg722_1" Name="libbroadvoice"
ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}"
RootNamespace="libg722_1" RootNamespace="libbroadvoice"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072" TargetFrameworkVersion="131072"
> >
@ -41,8 +41,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src; src\g722_1; src\msvc" AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -64,7 +64,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="2" LinkIncremental="2"
ModuleDefinitionFile="src/msvc/g722_1.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
@ -118,8 +117,8 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="src; src\g722_1; src\msvc" AdditionalIncludeDirectories=".; .\floating\common; .\floating\bv16; .\floating\bv32; .\broadvoice; .\msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="4" WarningLevel="4"
@ -138,7 +137,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkIncremental="1" LinkIncremental="1"
ModuleDefinitionFile="src/msvc/g722_1.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"