Author: mikej Date: Fri Jan 30 13:15:06 2009 New Revision: 11567 Log: add mod_fax to the windows build Added: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/spandsp/src/ (props changed) freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.vcproj freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def freeswitch/trunk/src/mod/applications/mod_fax/ (props changed) freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Fri Jan 30 13:15:06 2009 @@ -575,6 +575,25 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + ProjectSection(ProjectDependencies) = postProject + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fax", "src\mod\applications\mod_fax\mod_fax.2008.vcproj", "{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1290,6 +1309,30 @@ {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.ActiveCfg = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|x64.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|x64.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.Build.0 = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|x64.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.Build.0 = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Jan 30 13:15:06 2009 @@ -953,6 +953,25 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + ProjectSection(ProjectDependencies) = postProject + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + ProjectSection(ProjectDependencies) = postProject + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fax", "src\mod\applications\mod_fax\mod_fax.2008.vcproj", "{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1674,6 +1693,30 @@ {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.ActiveCfg = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|Win32.Build.0 = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Debug|x64.ActiveCfg = Debug|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.ActiveCfg = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|Win32.Build.0 = Release|Win32 + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}.Release|x64.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|x64.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|Win32.Build.0 = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Debug|x64.ActiveCfg = Debug|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.ActiveCfg = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|Win32.Build.0 = Release|Win32 + {7877EFC8-4807-484B-B573-D7B7FD058FAA}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1707,6 +1750,7 @@ {14E4A972-9CFB-436D-B0A5-4943F3F80D47} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {7877EFC8-4807-484B-B573-D7B7FD058FAA} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} @@ -1773,6 +1817,8 @@ {419C8F80-D858-4B48-A25C-AF4007608137} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1BC8A8EC-E03B-44DF-BCD9-088650F4D29C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF405366-9558-4AE8-90EF-5E21B51CCB4E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D} @@ -1786,6 +1832,7 @@ {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E796E337-DE78-4303-8614-9A590862EE95} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj Fri Jan 30 13:15:06 2009 @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="libspandsp" - ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" + ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" RootNamespace="libspandsp" Keyword="Win32Proj" TargetFrameworkVersion="131072" @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff\libtiff;.\generated" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/libs/spandsp/src/libtiff.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libtiff.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libtiff.vcproj Fri Jan 30 13:15:06 2009 @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" /> <Tool Name="VCCustomBuildTool" @@ -90,7 +90,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff\libtiff\tif_config.h" /Y" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" /> <Tool Name="VCCustomBuildTool" @@ -151,11 +151,11 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\tiff\libtiff\tif_aux.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_aux.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_close.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_close.c" > <FileConfiguration Name="Debug|Win32" @@ -166,83 +166,83 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_codec.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_codec.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_color.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_color.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_compress.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_compress.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dir.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirinfo.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirinfo.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirread.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirread.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dirwrite.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirwrite.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dumpmode.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dumpmode.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_error.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_error.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_extension.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_extension.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3sm.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3sm.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_flush.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_flush.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_getimage.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_getimage.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_jpeg.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_jpeg.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_luv.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_luv.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_lzw.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_lzw.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_next.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_next.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_ojpeg.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_ojpeg.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_open.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_open.c" > <FileConfiguration Name="Debug|Win32" @@ -253,55 +253,55 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_packbits.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_packbits.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_pixarlog.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_pixarlog.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_predict.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_print.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_print.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_read.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_read.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_strip.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_strip.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_swab.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_swab.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_thunder.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_thunder.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_tile.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_tile.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_unix.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_unix.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_version.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_version.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_warning.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_warning.c" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_write.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_write.c" > <FileConfiguration Name="Debug|Win32" @@ -312,7 +312,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\tiff\libtiff\tif_zip.c" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_zip.c" > </File> </Filter> @@ -320,47 +320,47 @@ Name="Header Files" > <File - RelativePath="..\..\tiff\libtiff\t4.h" + RelativePath="..\..\tiff-3.8.2\libtiff\t4.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_dir.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_fax3.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tif_predict.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiff.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiff.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffconf.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffconf.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffio.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffio.hxx" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.hxx" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffiop.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffiop.h" > </File> <File - RelativePath="..\..\tiff\libtiff\tiffvers.h" + RelativePath="..\..\tiff-3.8.2\libtiff\tiffvers.h" > </File> <File - RelativePath="..\..\tiff\libtiff\uvcode.h" + RelativePath="..\..\tiff-3.8.2\libtiff\uvcode.h" > </File> </Filter> Modified: freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h Fri Jan 30 13:15:06 2009 @@ -55,9 +55,15 @@ #pragma comment(lib, "ws2_32.lib") +#ifndef strncasecmp #define strncasecmp _strnicmp +#endif +#ifndef strcasecmp #define strcasecmp _stricmp +#endif +#ifndef snprintf #define snprintf _snprintf +#endif #if !defined(INFINITY) #define INFINITY 0x7fffffff Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.def Fri Jan 30 13:15:06 2009 @@ -274,4 +274,23 @@ v8_tx v8_rx v8_log_supported_modulations +t30_set_ecm_capability +t30_set_supported_compressions +t30_set_supported_modems +t30_set_supported_resolutions +t30_set_supported_image_sizes +t30_set_tx_page_header_info +t30_set_tx_ident +span_log_set_level +span_log_set_message_handler +fax_set_transmit_on_idle +fax_get_t30_state +t30_get_rx_model +t30_get_rx_vendor +t30_get_rx_country +t30_get_rx_ident +t30_get_tx_ident +t38_terminal_release +t38_terminal_get_t30_state +t30_terminate Added: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Fri Jan 30 13:15:06 2009 @@ -0,0 +1,123 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * spandsp.h - The head guy amongst the headers + * + * Written by Steve Underwood <steveu@coppice.org> + * + * Copyright (C) 2003 Steve Underwood + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id: spandsp.h.in,v 1.14 2009/01/07 13:31:53 steveu Exp $ + */ + +/*! \file */ + +#if !defined(_SPANDSP_H_) +#define _SPANDSP_H_ + +#undef SPANDSP_USE_FIXED_POINT +#undef SPANDSP_MISALIGNED_ACCESS_FAILS + +#include <stdlib.h> +#include <inttypes.h> +#include <string.h> +#include <limits.h> +#include <time.h> +#include <math.h> +#include <tiffio.h> + +#include <spandsp/telephony.h> +#include <spandsp/logging.h> +#include <spandsp/complex.h> +#include <spandsp/bit_operations.h> +#include <spandsp/bitstream.h> +#include <spandsp/queue.h> +#include <spandsp/schedule.h> +#include <spandsp/g711.h> +#include <spandsp/timing.h> +#include <spandsp/vector_float.h> +#include <spandsp/complex_vector_float.h> +#include <spandsp/vector_int.h> +#include <spandsp/complex_vector_int.h> +#include <spandsp/arctan2.h> +#include <spandsp/biquad.h> +#include <spandsp/fir.h> +#include <spandsp/awgn.h> +#include <spandsp/bert.h> +#include <spandsp/power_meter.h> +#include <spandsp/complex_filters.h> +#include <spandsp/dc_restore.h> +#include <spandsp/dds.h> +#include <spandsp/echo.h> +#include <spandsp/modem_echo.h> +#include <spandsp/crc.h> +#include <spandsp/hdlc.h> +#include <spandsp/async.h> +#include <spandsp/noise.h> +#include <spandsp/saturated.h> +#include <spandsp/time_scale.h> +#include <spandsp/tone_detect.h> +#include <spandsp/tone_generate.h> +#include <spandsp/super_tone_rx.h> +#include <spandsp/super_tone_tx.h> +#include <spandsp/dtmf.h> +#include <spandsp/bell_r2_mf.h> +#include <spandsp/sig_tone.h> +#include <spandsp/fsk.h> +#include <spandsp/modem_connect_tones.h> +#include <spandsp/silence_gen.h> +#include <spandsp/v29rx.h> +#include <spandsp/v29tx.h> +#include <spandsp/v17rx.h> +#include <spandsp/v17tx.h> +#include <spandsp/v22bis.h> +#include <spandsp/v27ter_rx.h> +#include <spandsp/v27ter_tx.h> +#include <spandsp/v8.h> +#include <spandsp/v42.h> +#include <spandsp/v42bis.h> +#include <spandsp/t4.h> +#include <spandsp/t30.h> +#include <spandsp/t30_api.h> +#include <spandsp/t30_fcf.h> +#include <spandsp/t30_logging.h> +#include <spandsp/t35.h> +#include <spandsp/at_interpreter.h> +#include <spandsp/fax_modems.h> +#include <spandsp/fax.h> +#include <spandsp/t38_core.h> +#include <spandsp/t38_non_ecm_buffer.h> +#include <spandsp/t38_gateway.h> +#include <spandsp/t38_terminal.h> +#include <spandsp/t31.h> +#include <spandsp/adsi.h> +#include <spandsp/oki_adpcm.h> +#include <spandsp/ima_adpcm.h> +#include <spandsp/g722.h> +#include <spandsp/g726.h> +#include <spandsp/lpc10.h> +#include <spandsp/gsm0610.h> +#include <spandsp/plc.h> +#include <spandsp/playout.h> + +#endif + +#if defined(SPANDSP_EXPOSE_INTERNAL_STRUCTURES) +#include <spandsp/expose.h> +#endif +/*- End of file ------------------------------------------------------------*/ Added: freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download TIFF.2008.vcproj Fri Jan 30 13:15:06 2009 @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download TIFF" + ProjectGUID="{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" + RootNamespace="Download TIFF" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\tiff\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Tiff." + CommandLine="if not exist "$(ProjectDir)..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir).." " + Outputs="$(ProjectDir)..\tiff-3.8.2" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading Lame." + CommandLine="if not exist "$(ProjectDir)..\tiff-3.8.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/tiff-3.8.2.tar.gz "$(ProjectDir).." " + Outputs="$(ProjectDir)..\tiff-3.8.2" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Fri Jan 30 13:15:06 2009 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_fax" + ProjectGUID="{7877EFC8-4807-484B-B573-D7B7FD058FAA}" + RootNamespace="mod_fax" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\spandsp\src\msvc";"$(InputDir)..\..\..\..\libs\spandsp\src";"$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <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" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\spandsp\src\msvc";"$(InputDir)..\..\..\..\libs\spandsp\src";"$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <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> + <File + RelativePath=".\mod_fax.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Fri Jan 30 13:15:06 2009 @@ -34,6 +34,26 @@ #include <switch.h> +#ifdef WIN32 + __inline float rintf(float flt) + { + _asm + { fld flt + frndint + } + } + + __inline double rint(double dbl) + { + __asm + { + fld dbl + frndint + } + } + +#endif + #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES #include <spandsp.h> #include <spandsp/version.h>