libbroadvoice some partial corrections for windows build

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15557 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/broadvoice/src/Makefile.am b/libs/broadvoice/src/Makefile.am
index 3aa4026608ffce81cb6d5da79391c1c4e1a5b04e..e3d0a53d6c78b94012cdc315df36cea90dc3aec6 100644 (file)
--- a/libs/broadvoice/src/Makefile.am
+++ b/libs/broadvoice/src/Makefile.am
@@ -114,7 +114,7 @@ noinst_PROGRAMS =
 DSP = broadvoice.dsp
 VCPROJ = broadvoice.vcproj
 
-WIN32SOURCES = $(broadvoice_la_SOURCES) msvc/gettimeofday.c
+WIN32SOURCES = $(libbroadvoice_la_SOURCES) msvc/gettimeofday.c
 WIN32HEADERS = $(nobase_include_HEADERS) broadvoice.h
 
 DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)

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

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