windows fix for recent tpl additions to switch_event.c

and revert a search and replace error for libtiff building
This commit is contained in:
Jeff Lenk 2012-09-14 12:13:36 -05:00
parent 83007777a0
commit d8cada59ee
4 changed files with 249 additions and 211 deletions

View File

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

View File

@ -47,8 +47,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
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;" 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;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -141,8 +141,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
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;" 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;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -234,8 +234,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
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;" 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;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
PrecompiledHeaderThrough="switch.h" PrecompiledHeaderThrough="switch.h"
@ -324,8 +324,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
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;" 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;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
PrecompiledHeaderThrough="switch.h" PrecompiledHeaderThrough="switch.h"
@ -466,97 +466,57 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\libs\stfu\stfu.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\libs\libtpl-1.5\src\win\mmap.c" RelativePath="..\..\libs\libtpl-1.5\src\win\mmap.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\libs\stfu\stfu.c"
>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
> >
@ -938,6 +898,54 @@
RelativePath="..\..\src\switch_xml_config.c" RelativePath="..\..\src\switch_xml_config.c"
> >
</File> </File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\tpl.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
WarnAsError="false"
/>
</FileConfiguration>
</File>
<Filter <Filter
Name="miniupnpc" Name="miniupnpc"
> >
@ -1480,6 +1488,10 @@
RelativePath="..\..\src\include\g711.h" RelativePath="..\..\src\include\g711.h"
> >
</File> </File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"
>
</File>
<File <File
RelativePath="..\..\src\include\SimpleGlob.h" RelativePath="..\..\src\include\SimpleGlob.h"
> >
@ -1488,14 +1500,6 @@
RelativePath="..\..\libs\stfu\stfu.h" RelativePath="..\..\libs\stfu\stfu.h"
> >
</File> </File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"
>
</File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\win\mman.h"
>
</File>
<File <File
RelativePath="..\..\src\include\switch.h" RelativePath="..\..\src\include\switch.h"
> >
@ -1636,6 +1640,10 @@
RelativePath="..\..\src\include\switch_xml_config.h" RelativePath="..\..\src\include\switch_xml_config.h"
> >
</File> </File>
<File
RelativePath="..\..\libs\libtpl-1.5\src\tpl.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

View File

@ -88,7 +88,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<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> <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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<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> <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>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<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> <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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<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> <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>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@ -286,6 +286,26 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>
</ClCompile>
<ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>
</ClCompile>
<ClCompile Include="..\..\src\g711.c"> <ClCompile Include="..\..\src\g711.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader> </PrecompiledHeader>
@ -690,6 +710,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h" />
<ClInclude Include="..\..\libs\miniupnpc\declspec.h" /> <ClInclude Include="..\..\libs\miniupnpc\declspec.h" />
<ClInclude Include="..\..\src\include\g711.h" /> <ClInclude Include="..\..\src\include\g711.h" />
<ClInclude Include="..\..\src\include\SimpleGlob.h" /> <ClInclude Include="..\..\src\include\SimpleGlob.h" />

View File

@ -202,6 +202,12 @@
<ClCompile Include="..\..\src\switch_curl.c"> <ClCompile Include="..\..\src\switch_curl.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\libs\libtpl-1.5\src\win\mmap.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\libs\miniupnpc\declspec.h"> <ClInclude Include="..\..\libs\miniupnpc\declspec.h">
@ -321,6 +327,9 @@
<ClInclude Include="..\..\src\include\switch_ivr.h"> <ClInclude Include="..\..\src\include\switch_ivr.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\libs\libtpl-1.5\src\tpl.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\include\switch_version.h.template" /> <CustomBuild Include="..\..\src\include\switch_version.h.template" />