windows fix for recent tpl additions to switch_event.c

and revert a search and replace error for libtiff building

diff --git a/libs/spandsp/src/libtiff.2008.vcproj b/libs/spandsp/src/libtiff.2008.vcproj
index a83dc87027637673e7d97b996cad50a56f3c61a7..4a2965033377d18d15848610ba5a4af5fa3f8747 100644 (file)
--- a/libs/spandsp/src/libtiff.2008.vcproj
+++ b/libs/spandsp/src/libtiff.2008.vcproj
@@ -16,8 +16,8 @@
                        Name="x64"\r
                />\r
        </Platforms>\r
-       <Tooltiff-4.0.2s>\r
-       </Tooltiff-4.0.2s>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
@@ -157,7 +157,7 @@
                        ConfigurationType="4"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
-                       BuildLogtiff-4.0.2="$(IntDir)\BuildLog $(ProjectName).htm"\r
+                       BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -278,206 +278,206 @@
        </Configurations>\r
        <References>\r
        </References>\r
-       <tiff-4.0.2s>\r
+       <Files>\r
                <Filter\r
                        Name="Source tiff-4.0.2s"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
-                       <tiff-4.0.2\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_aux.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_close.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_codec.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_color.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_compress.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dir.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirinfo.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirread.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dirwrite.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dumpmode.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_error.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_extension.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3sm.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_flush.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_getimage.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_jpeg.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_luv.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_lzw.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_next.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_ojpeg.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_open.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_packbits.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_pixarlog.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_predict.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_print.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_read.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_strip.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_swab.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_thunder.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_tile.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_unix.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_version.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_warning.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_write.c"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_zip.c"\r
                                >\r
-                       </tiff-4.0.2>\r
+                       </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Header tiff-4.0.2s"\r
+                       Name="Header Files"\r
                        >\r
-                       <tiff-4.0.2\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\t4.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_dir.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_fax3.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tif_predict.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiff.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiffconf.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiffio.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiffio.hxx"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiffiop.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\tiffvers.h"\r
                                >\r
-                       </tiff-4.0.2>\r
-                       <tiff-4.0.2\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\tiff-4.0.2\libtiff\uvcode.h"\r
                                >\r
-                       </tiff-4.0.2>\r
+                       </File>\r
                </Filter>\r
-       </tiff-4.0.2s>\r
+       </Files>\r
        <Globals>\r
        </Globals>\r
 </VisualStudioProject>\r

diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index d8f95d8d288b7f40adcdcef79f6fa74065e1f5cb..e4303b904d9e0b86d85c67c2a0521b8f71874630 100644 (file)
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -47,8 +47,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -141,8 +141,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -234,8 +234,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="switch.h"\r
@@ -324,8 +324,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="switch.h"\r
@@ -467,51 +467,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\stfu\stfu.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"\r
+                               RelativePath="..\..\libs\libtpl-1.5\src\win\mmap.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
@@ -521,6 +477,7 @@
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
                                                PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -531,6 +488,7 @@
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
                                                PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -541,6 +499,7 @@
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
                                                PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -551,11 +510,12 @@
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
                                                PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\libtpl-1.5\src\win\mmap.c"\r
+                               RelativePath="..\..\libs\stfu\stfu.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
@@ -938,6 +898,54 @@
                                RelativePath="..\..\src\switch_xml_config.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               WarnAsError="false"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
                        <Filter\r
                                Name="miniupnpc"\r
                                >\r
@@ -1481,19 +1489,15 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\SimpleGlob.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\libs\stfu\stfu.h"\r
+                               RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"\r
+                               RelativePath="..\..\src\include\SimpleGlob.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"\r
+                               RelativePath="..\..\libs\stfu\stfu.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1636,6 +1640,10 @@
                                RelativePath="..\..\src\include\switch_xml_config.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 2142a4b269af5bf1ca79f92d6c6c0742d956f87d..44fc58ea93284a7b2fc4dd330cf963a1f68cc5b4 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,7 +88,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>\r
@@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
       <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>\r
@@ -286,6 +286,26 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\src\g711.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
@@ -690,6 +710,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h" />\r
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h" />\r
     <ClInclude Include="..\..\src\include\g711.h" />\r
     <ClInclude Include="..\..\src\include\SimpleGlob.h" />\r

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
index 79369a8bb3adb66ca327fae9e94c727138a35af9..9766295d1388ad4ca510beb4d724e26e17a877a5 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
@@ -202,6 +202,12 @@
     <ClCompile Include="..\..\src\switch_curl.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h">\r
@@ -321,6 +327,9 @@
     <ClInclude Include="..\..\src\include\switch_ivr.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <CustomBuild Include="..\..\src\include\switch_version.h.template" />\r