build integration

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

diff --git a/libs/spandsp/src/libspandsp.sln b/libs/spandsp/src/libspandsp.sln
index 8e63a4229c3118172e3576f541de9a0497a09a50..36adaf8a7d7d62596e2b3dfe3253d1720a5376c3 100644 (file)
--- a/libs/spandsp/src/libspandsp.sln
+++ b/libs/spandsp/src/libspandsp.sln
@@ -4,10 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94}\r
+               {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "at_dictionary_gen", "src\msvc\at_dictionary_gen.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -22,6 +25,10 @@ Global
                {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.Build.0 = Debug|Win32\r
                {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32\r
                {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32\r
+               {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32\r
+               {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32\r
+               {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/libs/spandsp/src/libspandsp.vcproj b/libs/spandsp/src/libspandsp.vcproj
index cc7f9420ff8936b2f2aee3fe859ca7c38b2ad627..001fc79fb2627abd66fcca74594c1370c5d0db3d 100644 (file)
--- a/libs/spandsp/src/libspandsp.vcproj
+++ b/libs/spandsp/src/libspandsp.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\libtiff\include;.\generated"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +118,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\libtiff\include;.\generated"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/libs/spandsp/src/libtiff.vcproj b/libs/spandsp/src/libtiff.vcproj
new file mode 100644 (file)
index 0000000..a4ed01d
--- /dev/null
+++ b/libs/spandsp/src/libtiff.vcproj
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="libtiff"\r
+       ProjectGUID="{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"\r
+       RootNamespace="libtiff"\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="4"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="if not exist &quot;$(ProjectDir)../../tiff/libtiff/tif_config.h&quot; copy &quot;$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc&quot; &quot;$(ProjectDir)..\..\tiff\libtiff\tiffconf.h&quot; /Y&#x0D;&#x0A;if not exist &quot;$(ProjectDir)../../tiff/libtiff/tif_config.h&quot; copy &quot;$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc&quot; &quot;$(ProjectDir)..\..\tiff\libtiff\tif_config.h&quot; /Y"\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="."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="0"\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="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="if not exist &quot;$(ProjectDir)../../tiff/libtiff/tif_config.h&quot; copy &quot;$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc&quot; &quot;$(ProjectDir)..\..\tiff\libtiff\tiffconf.h&quot; /Y&#x0D;&#x0A;if not exist &quot;$(ProjectDir)../../tiff/libtiff/tif_config.h&quot; copy &quot;$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc&quot; &quot;$(ProjectDir)..\..\tiff\libtiff\tif_config.h&quot; /Y"\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="."\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="0"\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="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\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\r
+                               RelativePath="..\..\tiff\libtiff\tif_aux.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_close.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_codec.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_color.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_compress.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dir.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dirinfo.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dirread.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dirwrite.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dumpmode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_error.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_extension.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_fax3.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_fax3sm.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_flush.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_getimage.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_jpeg.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_luv.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_lzw.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_next.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_ojpeg.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_open.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_packbits.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_pixarlog.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_predict.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_print.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_read.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_strip.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_swab.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_thunder.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_tile.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_unix.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_version.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_warning.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_write.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_zip.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\t4.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_dir.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_fax3.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tif_predict.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiff.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiffconf.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiffio.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiffio.hxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiffiop.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\tiffvers.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\tiff\libtiff\uvcode.h"\r
+                               >\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;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/spandsp/src/msvc/vc8proj.head b/libs/spandsp/src/msvc/vc8proj.head
index 9267393c0c25acbfb67d84a22e8ff7a09c2e97c2..06ae22a1a96eba1eb3df070607195a908f10d37b 100644 (file)
--- a/libs/spandsp/src/msvc/vc8proj.head
+++ b/libs/spandsp/src/msvc/vc8proj.head
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\libtiff\include"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\tiff\libtiff"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +118,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\libtiff\include"\r
+                               AdditionalIncludeDirectories=".;.\spandsp;.\msvc;.\generated;..\..\tiff\libtiff"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r