提交 55da2afa authored 作者: Moises Silva's avatar Moises Silva

Merge branch 'moy.nonblocking-api' of git.sangoma.com:smg_freeswitch into moy.nonblocking-api

...@@ -95,12 +95,11 @@ ...@@ -95,12 +95,11 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\BuildLog-freetdm.htm" BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
> >
<Tool <Tool
...@@ -117,12 +116,16 @@ ...@@ -117,12 +116,16 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include" AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
RuntimeLibrary="2" MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="false" DisableLanguageExtensions="false"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -143,6 +146,8 @@ ...@@ -143,6 +146,8 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -167,11 +172,12 @@ ...@@ -167,11 +172,12 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\BuildLog-freetdm.htm" BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
> >
<Tool <Tool
...@@ -188,16 +194,12 @@ ...@@ -188,16 +194,12 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include" AdditionalIncludeDirectories="../src/include;../src/include/private;../src/isdn/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
MinimalRebuild="true" RuntimeLibrary="2"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="false" DisableLanguageExtensions="false"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -218,8 +220,6 @@ ...@@ -218,8 +220,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -366,6 +366,10 @@ ...@@ -366,6 +366,10 @@
RelativePath="..\src\include\private\ftdm_sched.h" RelativePath="..\src\include\private\ftdm_sched.h"
> >
</File> </File>
<File
RelativePath="..\src\include\private\ftdm_state.h"
>
</File>
<File <File
RelativePath="..\src\include\ftdm_threadmutex.h" RelativePath="..\src\include\ftdm_threadmutex.h"
> >
...@@ -452,6 +456,10 @@ ...@@ -452,6 +456,10 @@
RelativePath="..\src\ftdm_sched.c" RelativePath="..\src\ftdm_sched.c"
> >
</File> </File>
<File
RelativePath="..\src\ftdm_state.c"
>
</File>
<File <File
RelativePath="..\src\ftdm_threadmutex.c" RelativePath="..\src\ftdm_threadmutex.c"
> >
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论