From ec44f6aec0755ba5dc8f6b51d9cbbfa834af9329 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Mon, 8 Apr 2013 21:17:02 -0500
Subject: [PATCH] FS-5167
---
Freeswitch.2010.sln | 20 ++
Freeswitch.2012.sln | 30 +++
libs/esl/fs_cli.2012.vcxproj | 21 ++-
libs/esl/fs_cli.2012.vcxproj.filters | 10 +
libs/esl/fs_cli.rc | 1 +
libs/esl/switch_version.rc2 | 51 +++++
libs/win32/Download 16khz Sounds.2010.vcxproj | 1 +
libs/win32/Download 16khz Sounds.2012.vcxproj | 1 +
libs/win32/Download 16khz music.2010.vcxproj | 1 +
libs/win32/Download 16khz music.2012.vcxproj | 1 +
libs/win32/Download 32khz music.2010.vcxproj | 1 +
libs/win32/Download 32khz music.2012.vcxproj | 1 +
libs/win32/Download 8khz Sounds.2010.vcxproj | 1 +
libs/win32/Download 8khz Sounds.2012.vcxproj | 1 +
libs/win32/Download CELT.2012.vcxproj | 1 +
libs/win32/Download CELT.vcxproj | 1 +
libs/win32/Download FLITE.2010.vcxproj | 1 +
libs/win32/Download FLITE.2012.vcxproj | 1 +
libs/win32/Download JSON.2010.vcxproj | 1 +
libs/win32/Download JSON.2012.vcxproj | 1 +
libs/win32/Download LAME.2010.vcxproj | 1 +
libs/win32/Download LAME.2012.vcxproj | 1 +
libs/win32/Download LIBSHOUT.2010.vcxproj | 1 +
libs/win32/Download LIBSHOUT.2012.vcxproj | 1 +
libs/win32/Download OGG.2010.vcxproj | 1 +
libs/win32/Download OGG.2012.vcxproj | 1 +
libs/win32/Download OPENSSL.2010.vcxproj | 3 +-
libs/win32/Download OPENSSL.2012.vcxproj | 3 +-
libs/win32/Download PTHREAD.2010.vcxproj | 1 +
libs/win32/Download PTHREAD.2012.vcxproj | 1 +
libs/win32/Download libjpeg.2010.vcxproj | 1 +
libs/win32/Download libjpeg.2012.vcxproj | 1 +
libs/win32/Download mpg123.2010.vcxproj | 1 +
libs/win32/Download mpg123.2012.vcxproj | 1 +
libs/win32/Download pocketsphinx.2010.vcxproj | 1 +
libs/win32/Download pocketsphinx.2012.vcxproj | 1 +
libs/win32/Download sphinxbase.2010.vcxproj | 1 +
libs/win32/Download sphinxbase.2012.vcxproj | 1 +
libs/win32/Download sphinxmodel.2010.vcxproj | 1 +
libs/win32/Download sphinxmodel.2012.vcxproj | 1 +
libs/win32/libcbt/libcbt.2010.vcxproj | 177 ++++++++++++++++++
libs/win32/libcbt/libcbt.2010.vcxproj.filters | 40 ++++
libs/win32/libcbt/libcbt.2012.vcxproj | 152 +++++++++++++++
libs/win32/libcbt/libcbt.2012.vcxproj.filters | 40 ++++
libs/win32/pcre/libpcre.2010.vcxproj | 12 +-
libs/win32/pcre/libpcre.2012.vcxproj | 12 +-
libs/win32/pthread/pthread.2010.vcxproj | 12 +-
libs/win32/pthread/pthread.2012.vcxproj | 12 +-
libs/win32/sqlite/sqlite.2012.vcxproj | 12 +-
libs/win32/util.vbs | 36 +++-
src/include/switch_platform.h | 2 +
.../mod_unimrcp/mod_unimrcp.2010.vcxproj | 2 +-
.../win32/gsmlib.2012.vcxproj | 37 +---
.../mod_gsmopen/mod_gsmopen.2010.vcxproj | 11 +-
.../mod_gsmopen/mod_gsmopen.2012.vcxproj | 20 +-
src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp | 14 +-
w32/Console/FreeSwitchConsole.2012.vcxproj | 18 +-
w32/Library/FreeSwitchCore.2012.vcxproj | 27 +++
.../FreeSwitchCore.2012.vcxproj.filters | 22 ++-
w32/Library/FreeSwitchCoreLib.rc | 1 +
w32/Library/switch_version.inc.template | 50 +++++
w32/Library/switch_version.rc2 | 50 +++++
62 files changed, 831 insertions(+), 99 deletions(-)
create mode 100644 libs/esl/fs_cli.rc
create mode 100644 libs/esl/switch_version.rc2
create mode 100644 libs/win32/libcbt/libcbt.2010.vcxproj
create mode 100644 libs/win32/libcbt/libcbt.2010.vcxproj.filters
create mode 100644 libs/win32/libcbt/libcbt.2012.vcxproj
create mode 100644 libs/win32/libcbt/libcbt.2012.vcxproj.filters
create mode 100644 w32/Library/FreeSwitchCoreLib.rc
create mode 100644 w32/Library/switch_version.inc.template
create mode 100644 w32/Library/switch_version.rc2
diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index aec059ff29..9f76dde7c9 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -568,6 +568,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\win32\xmlrpc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\spandsp\src\msvc\make_math_fixed_tables.2010.vcxproj", "{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2010.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
All|Win32 = All|Win32
@@ -3772,6 +3774,23 @@ Global
{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6}.Release|x64.Build.0 = All|Win32
{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6}.Release|x64 Setup.ActiveCfg = All|Win32
{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6}.Release|x86 Setup.ActiveCfg = All|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.Build.0 = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x64.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x64 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x86 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.Build.0 = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.ActiveCfg = Debug|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.Build.0 = Debug|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.Build.0 = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.ActiveCfg = Release|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.Build.0 = Release|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x86 Setup.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -3886,6 +3905,7 @@ Global
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{9D04A840-CE18-4FF5-A6D3-0A2BB92FF2E6} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index 81e0d72083..7e2d13e128 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -372,6 +372,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download mpg123", "libs\win32\Download mpg123.2012.vcxproj", "{E796E337-DE78-4303-8614-9A590862EE95}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpg123", "libs\win32\mpg123\libmpg123.2012.vcxproj", "{419C8F80-D858-4B48-A25C-AF4007608137}"
+ ProjectSection(ProjectDependencies) = postProject
+ {E796E337-DE78-4303-8614-9A590862EE95} = {E796E337-DE78-4303-8614-9A590862EE95}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_loopback", "src\mod\endpoints\mod_loopback\mod_loopback.2012.vcxproj", "{B3F424EC-3D8F-417C-B244-3919D5E1A577}"
EndProject
@@ -384,6 +387,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "esl", "libs\esl\src\esl.2012.vcxproj", "{CF405366-9558-4AE8-90EF-5E21B51CCB4E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fs_cli", "libs\esl\fs_cli.2012.vcxproj", "{D2FB8043-D208-4AEE-8F18-3B5857C871B9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_easyroute", "src\mod\applications\mod_easyroute\mod_easyroute.2012.vcxproj", "{329FD5B0-EF28-4606-86D0-F6EA21CF8E36}"
EndProject
@@ -567,6 +573,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup.2012", "w32\Setup\Set
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\spandsp\src\msvc\make_math_fixed_tables.2012.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2012.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
All|Win32 = All|Win32
@@ -3564,10 +3572,12 @@ Global
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.All|x64 Setup.ActiveCfg = Release|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.All|x86 Setup.ActiveCfg = Release|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|Win32.Build.0 = Debug|Win32
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|x64.ActiveCfg = Debug|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|x64 Setup.ActiveCfg = Debug|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Debug|x86 Setup.ActiveCfg = Debug|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.ActiveCfg = Release|Win32
+ {26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|Win32.Build.0 = Release|Win32
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|x64.ActiveCfg = Release|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|x64 Setup.ActiveCfg = Release|x64
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53}.Release|x86 Setup.ActiveCfg = Release|x64
@@ -3577,10 +3587,12 @@ Global
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.All|x64 Setup.ActiveCfg = Release|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.All|x86 Setup.ActiveCfg = Release|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|Win32.ActiveCfg = Debug|Win32
+ {74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|Win32.Build.0 = Debug|Win32
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|x64.ActiveCfg = Debug|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|x64 Setup.ActiveCfg = Debug|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Debug|x86 Setup.ActiveCfg = Debug|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.ActiveCfg = Release|Win32
+ {74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.Build.0 = Release|Win32
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64 Setup.ActiveCfg = Release|x64
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x86 Setup.ActiveCfg = Release|x64
@@ -3772,6 +3784,23 @@ Global
{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|x64.Build.0 = All|Win32
{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|x64 Setup.ActiveCfg = All|Win32
{2386B892-35F5-46CF-A0F0-10394D2FBF9B}.Release|x86 Setup.ActiveCfg = All|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|Win32.Build.0 = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x64.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x64 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.All|x86 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|Win32.Build.0 = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.ActiveCfg = Debug|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64.Build.0 = Debug|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x64 Setup.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Debug|x86 Setup.ActiveCfg = Debug|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|Win32.Build.0 = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.ActiveCfg = Release|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64.Build.0 = Release|x64
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x64 Setup.ActiveCfg = Release|Win32
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}.Release|x86 Setup.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -3886,6 +3915,7 @@ Global
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+ {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}
{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000}
diff --git a/libs/esl/fs_cli.2012.vcxproj b/libs/esl/fs_cli.2012.vcxproj
index 0f3747eeae..140736b9dd 100644
--- a/libs/esl/fs_cli.2012.vcxproj
+++ b/libs/esl/fs_cli.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -205,6 +205,25 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="fs_cli.rc">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>
+ <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ShowProgress>
+ <ResourceOutputFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName).res</ResourceOutputFileName>
+ <DeploymentContent>false</DeploymentContent>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="switch_version.rc2" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/libs/esl/fs_cli.2012.vcxproj.filters b/libs/esl/fs_cli.2012.vcxproj.filters
index dfc1faab80..b846085945 100644
--- a/libs/esl/fs_cli.2012.vcxproj.filters
+++ b/libs/esl/fs_cli.2012.vcxproj.filters
@@ -27,4 +27,14 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="fs_cli.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="switch_version.rc2">
+ <Filter>Resource Files</Filter>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/libs/esl/fs_cli.rc b/libs/esl/fs_cli.rc
new file mode 100644
index 0000000000..09622ba763
--- /dev/null
+++ b/libs/esl/fs_cli.rc
@@ -0,0 +1 @@
+#include "switch_version.rc2"
diff --git a/libs/esl/switch_version.rc2 b/libs/esl/switch_version.rc2
new file mode 100644
index 0000000000..9777a76302
--- /dev/null
+++ b/libs/esl/switch_version.rc2
@@ -0,0 +1,51 @@
+#include "switch_version.inc"
+#include <verrsrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
+ PRODUCTVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "Comments", "See you at Cluecon!"
+ VALUE "CompanyName", "FreeSWITCH"
+#ifdef _DEBUG
+ #ifdef _WIN64
+ VALUE "FileDescription", "FS_CLI " SWITCH_VERSION_ALL " x64 Debug"
+ #else
+ VALUE "FileDescription", "FS_CLI " SWITCH_VERSION_ALL " x86/win32 Debug"
+ #endif
+#else
+ #ifdef _WIN64
+ VALUE "FileDescription", "FS_CLI " SWITCH_VERSION_ALL " x64 Release"
+ #else
+ VALUE "FileDescription", "FS_CLI " SWITCH_VERSION_ALL " x86/win32 Release"
+ #endif
+#endif
+ VALUE "FileDescription", "FS_CLI " SWITCH_VERSION_ALL
+ VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
+ VALUE "InternalName", "FS_CLI " SWITCH_VERSION_REVISION_HUMAN
+ VALUE "LegalCopyright", "� 2005-" SWITCH_VERSION_YEAR " www.freeswitch.org"
+ VALUE "OriginalFilename", "fs_cli.exe"
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "FreeSWITCH Terminal / Command Line Interface " SWITCH_VERSION_REVISION_HUMAN
+ VALUE "ProductVersion", SWITCH_VERSION_ALL
+ VALUE "SpecialBuild", SWITCH_VERSION_REVISION
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
diff --git a/libs/win32/Download 16khz Sounds.2010.vcxproj b/libs/win32/Download 16khz Sounds.2010.vcxproj
index a191394bc5..2e18d6882d 100644
--- a/libs/win32/Download 16khz Sounds.2010.vcxproj
+++ b/libs/win32/Download 16khz Sounds.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 16khz Sounds.2012.vcxproj b/libs/win32/Download 16khz Sounds.2012.vcxproj
index 94c765e2f6..ca27f0d9de 100644
--- a/libs/win32/Download 16khz Sounds.2012.vcxproj
+++ b/libs/win32/Download 16khz Sounds.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 16khz music.2010.vcxproj b/libs/win32/Download 16khz music.2010.vcxproj
index abc4dd42bf..e133fff984 100644
--- a/libs/win32/Download 16khz music.2010.vcxproj
+++ b/libs/win32/Download 16khz music.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 16khz music.2012.vcxproj b/libs/win32/Download 16khz music.2012.vcxproj
index 7a4d11ec42..996134018d 100644
--- a/libs/win32/Download 16khz music.2012.vcxproj
+++ b/libs/win32/Download 16khz music.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 32khz music.2010.vcxproj b/libs/win32/Download 32khz music.2010.vcxproj
index eed9135110..5fd32268b0 100644
--- a/libs/win32/Download 32khz music.2010.vcxproj
+++ b/libs/win32/Download 32khz music.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 32khz music.2012.vcxproj b/libs/win32/Download 32khz music.2012.vcxproj
index 6b103b8552..11baeea278 100644
--- a/libs/win32/Download 32khz music.2012.vcxproj
+++ b/libs/win32/Download 32khz music.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 8khz Sounds.2010.vcxproj b/libs/win32/Download 8khz Sounds.2010.vcxproj
index 2bdb178891..afab0bd670 100644
--- a/libs/win32/Download 8khz Sounds.2010.vcxproj
+++ b/libs/win32/Download 8khz Sounds.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download 8khz Sounds.2012.vcxproj b/libs/win32/Download 8khz Sounds.2012.vcxproj
index 67a5fb02f6..b02d64275d 100644
--- a/libs/win32/Download 8khz Sounds.2012.vcxproj
+++ b/libs/win32/Download 8khz Sounds.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download CELT.2012.vcxproj b/libs/win32/Download CELT.2012.vcxproj
index b47c19101c..e07e8e44b3 100644
--- a/libs/win32/Download CELT.2012.vcxproj
+++ b/libs/win32/Download CELT.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download CELT.vcxproj b/libs/win32/Download CELT.vcxproj
index 527ff5a5f5..e36394208a 100644
--- a/libs/win32/Download CELT.vcxproj
+++ b/libs/win32/Download CELT.vcxproj
@@ -25,6 +25,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download FLITE.2010.vcxproj b/libs/win32/Download FLITE.2010.vcxproj
index ca1f31338f..d7690645b0 100644
--- a/libs/win32/Download FLITE.2010.vcxproj
+++ b/libs/win32/Download FLITE.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download FLITE.2012.vcxproj b/libs/win32/Download FLITE.2012.vcxproj
index 1d62dda438..eea3006edf 100644
--- a/libs/win32/Download FLITE.2012.vcxproj
+++ b/libs/win32/Download FLITE.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download JSON.2010.vcxproj b/libs/win32/Download JSON.2010.vcxproj
index d0dad578f6..cb82ed6830 100644
--- a/libs/win32/Download JSON.2010.vcxproj
+++ b/libs/win32/Download JSON.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download JSON.2012.vcxproj b/libs/win32/Download JSON.2012.vcxproj
index c318d63993..114131db28 100644
--- a/libs/win32/Download JSON.2012.vcxproj
+++ b/libs/win32/Download JSON.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download LAME.2010.vcxproj b/libs/win32/Download LAME.2010.vcxproj
index 2411534cd7..8249728f87 100644
--- a/libs/win32/Download LAME.2010.vcxproj
+++ b/libs/win32/Download LAME.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download LAME.2012.vcxproj b/libs/win32/Download LAME.2012.vcxproj
index a373d07621..2c19b3794e 100644
--- a/libs/win32/Download LAME.2012.vcxproj
+++ b/libs/win32/Download LAME.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download LIBSHOUT.2010.vcxproj b/libs/win32/Download LIBSHOUT.2010.vcxproj
index 971ad0cf9c..3e176bcf00 100644
--- a/libs/win32/Download LIBSHOUT.2010.vcxproj
+++ b/libs/win32/Download LIBSHOUT.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download LIBSHOUT.2012.vcxproj b/libs/win32/Download LIBSHOUT.2012.vcxproj
index ec58a29db5..69cbdfd355 100644
--- a/libs/win32/Download LIBSHOUT.2012.vcxproj
+++ b/libs/win32/Download LIBSHOUT.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download OGG.2010.vcxproj b/libs/win32/Download OGG.2010.vcxproj
index 90ea59bf87..0bf9910d31 100644
--- a/libs/win32/Download OGG.2010.vcxproj
+++ b/libs/win32/Download OGG.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download OGG.2012.vcxproj b/libs/win32/Download OGG.2012.vcxproj
index 7e8baef73a..2e16943da0 100644
--- a/libs/win32/Download OGG.2012.vcxproj
+++ b/libs/win32/Download OGG.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download OPENSSL.2010.vcxproj b/libs/win32/Download OPENSSL.2010.vcxproj
index 78380f9ef0..bd3ec16307 100644
--- a/libs/win32/Download OPENSSL.2010.vcxproj
+++ b/libs/win32/Download OPENSSL.2010.vcxproj
@@ -27,6 +27,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -38,9 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\OPENSSL\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\OPENSSL\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/win32/Download OPENSSL.2012.vcxproj b/libs/win32/Download OPENSSL.2012.vcxproj
index f230e45515..114e21d193 100644
--- a/libs/win32/Download OPENSSL.2012.vcxproj
+++ b/libs/win32/Download OPENSSL.2012.vcxproj
@@ -29,6 +29,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -40,9 +41,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\OPENSSL\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\OPENSSL\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/win32/Download PTHREAD.2010.vcxproj b/libs/win32/Download PTHREAD.2010.vcxproj
index 9417b3e17d..f216528835 100644
--- a/libs/win32/Download PTHREAD.2010.vcxproj
+++ b/libs/win32/Download PTHREAD.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download PTHREAD.2012.vcxproj b/libs/win32/Download PTHREAD.2012.vcxproj
index 2db503a134..89f53f8b1d 100644
--- a/libs/win32/Download PTHREAD.2012.vcxproj
+++ b/libs/win32/Download PTHREAD.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download libjpeg.2010.vcxproj b/libs/win32/Download libjpeg.2010.vcxproj
index 56844e037c..61adfce6cb 100644
--- a/libs/win32/Download libjpeg.2010.vcxproj
+++ b/libs/win32/Download libjpeg.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download libjpeg.2012.vcxproj b/libs/win32/Download libjpeg.2012.vcxproj
index 4749709a4f..456160b4f9 100644
--- a/libs/win32/Download libjpeg.2012.vcxproj
+++ b/libs/win32/Download libjpeg.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download mpg123.2010.vcxproj b/libs/win32/Download mpg123.2010.vcxproj
index a135cfa1c9..303bc6d65d 100644
--- a/libs/win32/Download mpg123.2010.vcxproj
+++ b/libs/win32/Download mpg123.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download mpg123.2012.vcxproj b/libs/win32/Download mpg123.2012.vcxproj
index a4845c0169..c3afc46a82 100644
--- a/libs/win32/Download mpg123.2012.vcxproj
+++ b/libs/win32/Download mpg123.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download pocketsphinx.2010.vcxproj b/libs/win32/Download pocketsphinx.2010.vcxproj
index 428927e063..f6e7ee1b70 100644
--- a/libs/win32/Download pocketsphinx.2010.vcxproj
+++ b/libs/win32/Download pocketsphinx.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download pocketsphinx.2012.vcxproj b/libs/win32/Download pocketsphinx.2012.vcxproj
index 5c354a895f..eddf1f6831 100644
--- a/libs/win32/Download pocketsphinx.2012.vcxproj
+++ b/libs/win32/Download pocketsphinx.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download sphinxbase.2010.vcxproj b/libs/win32/Download sphinxbase.2010.vcxproj
index 4a5cca6011..6565deb524 100644
--- a/libs/win32/Download sphinxbase.2010.vcxproj
+++ b/libs/win32/Download sphinxbase.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download sphinxbase.2012.vcxproj b/libs/win32/Download sphinxbase.2012.vcxproj
index f2bf4faef4..91d4dac925 100644
--- a/libs/win32/Download sphinxbase.2012.vcxproj
+++ b/libs/win32/Download sphinxbase.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download sphinxmodel.2010.vcxproj b/libs/win32/Download sphinxmodel.2010.vcxproj
index 42087f4479..3ccb34535f 100644
--- a/libs/win32/Download sphinxmodel.2010.vcxproj
+++ b/libs/win32/Download sphinxmodel.2010.vcxproj
@@ -26,6 +26,7 @@
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/Download sphinxmodel.2012.vcxproj b/libs/win32/Download sphinxmodel.2012.vcxproj
index 1244870149..c65e894c6d 100644
--- a/libs/win32/Download sphinxmodel.2012.vcxproj
+++ b/libs/win32/Download sphinxmodel.2012.vcxproj
@@ -28,6 +28,7 @@
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(SolutionDir)\w32\extdll.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
diff --git a/libs/win32/libcbt/libcbt.2010.vcxproj b/libs/win32/libcbt/libcbt.2010.vcxproj
new file mode 100644
index 0000000000..8f0f7ce56b
--- /dev/null
+++ b/libs/win32/libcbt/libcbt.2010.vcxproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\fifo.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\getopt.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\gpib.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\iobase.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\kbhit.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\portscan.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\serportx.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\getopt.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\serport.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\timer.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\ctb.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\fifo.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\getopt.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\gpib.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\iobase.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\kbhit.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\portscan.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serport.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serportx.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\timer.h" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>Win32Project1</RootNamespace>
+ <ProjectName>libcbt</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ <TargetExt>.lib</TargetExt>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ <TargetExt>.lib</TargetExt>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ <TargetExt>.lib</TargetExt>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ <TargetExt>.lib</TargetExt>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/win32/libcbt/libcbt.2010.vcxproj.filters b/libs/win32/libcbt/libcbt.2010.vcxproj.filters
new file mode 100644
index 0000000000..b5b7ad717d
--- /dev/null
+++ b/libs/win32/libcbt/libcbt.2010.vcxproj.filters
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="include">
+ <UniqueIdentifier>{0a4bdcda-43d0-4907-83ce-01f3a87cdf59}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\ctb.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\fifo.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\gpib.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\getopt.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\iobase.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\kbhit.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\portscan.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serport.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serportx.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\timer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
diff --git a/libs/win32/libcbt/libcbt.2012.vcxproj b/libs/win32/libcbt/libcbt.2012.vcxproj
new file mode 100644
index 0000000000..0bcb540224
--- /dev/null
+++ b/libs/win32/libcbt/libcbt.2012.vcxproj
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\fifo.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\getopt.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\gpib.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\iobase.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\kbhit.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\portscan.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\serportx.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\getopt.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\serport.cpp" />
+ <ClCompile Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\src\win32\timer.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\ctb.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\fifo.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\getopt.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\gpib.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\iobase.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\kbhit.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\portscan.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serport.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serportx.h" />
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\timer.h" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}</ProjectGuid>
+ <ProjectName>libcbt</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v110</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v110</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <OutDir>$(PlatformName)\$(Configuration)\</OutDir>
+ <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+ <TargetExt>.lib</TargetExt>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
diff --git a/libs/win32/libcbt/libcbt.2012.vcxproj.filters b/libs/win32/libcbt/libcbt.2012.vcxproj.filters
new file mode 100644
index 0000000000..b5b7ad717d
--- /dev/null
+++ b/libs/win32/libcbt/libcbt.2012.vcxproj.filters
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="include">
+ <UniqueIdentifier>{0a4bdcda-43d0-4907-83ce-01f3a87cdf59}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\ctb.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\fifo.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\gpib.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\getopt.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\iobase.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\kbhit.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\portscan.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serport.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\serportx.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\mod\endpoints\mod_gsmopen\libctb-0.16\include\ctb-0.16\timer.h">
+ <Filter>include</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
diff --git a/libs/win32/pcre/libpcre.2010.vcxproj b/libs/win32/pcre/libpcre.2010.vcxproj
index 22db6b7a50..ddbbffee52 100644
--- a/libs/win32/pcre/libpcre.2010.vcxproj
+++ b/libs/win32/pcre/libpcre.2010.vcxproj
@@ -106,17 +106,17 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/win32/pcre/libpcre.2012.vcxproj b/libs/win32/pcre/libpcre.2012.vcxproj
index 8724fd6ff2..fdd48188de 100644
--- a/libs/win32/pcre/libpcre.2012.vcxproj
+++ b/libs/win32/pcre/libpcre.2012.vcxproj
@@ -114,17 +114,17 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\pcre\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/win32/pthread/pthread.2010.vcxproj b/libs/win32/pthread/pthread.2010.vcxproj
index 92a2652bf0..76bb18976a 100644
--- a/libs/win32/pthread/pthread.2010.vcxproj
+++ b/libs/win32/pthread/pthread.2010.vcxproj
@@ -114,14 +114,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\pthread\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\pthread\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\pthread\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\pthread\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
diff --git a/libs/win32/pthread/pthread.2012.vcxproj b/libs/win32/pthread/pthread.2012.vcxproj
index b416c27d16..986fc9ad52 100644
--- a/libs/win32/pthread/pthread.2012.vcxproj
+++ b/libs/win32/pthread/pthread.2012.vcxproj
@@ -122,14 +122,14 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\pthread\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\pthread\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\pthread\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\pthread\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
diff --git a/libs/win32/sqlite/sqlite.2012.vcxproj b/libs/win32/sqlite/sqlite.2012.vcxproj
index ccd02d39bc..6605786d46 100644
--- a/libs/win32/sqlite/sqlite.2012.vcxproj
+++ b/libs/win32/sqlite/sqlite.2012.vcxproj
@@ -115,17 +115,17 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">$(Platform)\sqlite\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">$(Platform)\sqlite\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">$(Platform)\sqlite\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">$(Platform)\sqlite\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index 15d69a8924..f22d9dd284 100644
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -151,7 +151,7 @@ Sub ExecPrintOutput(Str)
End If
Loop Until (Process.Status <> 0) And (Process.StdOut.atEndOfStream)
- Process.Terminate
+ Process.Terminate
WScript.Sleep(500)
End Sub
@@ -250,7 +250,7 @@ Sub Slow_Wget(URL, DestFolder)
const ForReading = 1 , ForWriting = 2 , ForAppending = 8
Set MyFile = FSO.OpenTextFile(DestFolder & filename ,ForWriting, True)
For i = 1 to lenb(xml.responseBody)
- MyFile.write Chr(Ascb(midb(xml.responseBody,i,1)))
+ MyFile.write Chr(Ascb(midb(xml.responseBody,i,1)))
Next
MyFile.Close()
Set MyFile = Nothing
@@ -277,8 +277,8 @@ Function FindVersionStringInConfigure(strConfigFile, strVersionString)
strResult = ""
If colMatches.Count > 0 Then
- For Each strMatch in colMatches
- strResult = objRegEx.Replace(strMatch.Value, "$1")
+ For Each strMatch in colMatches
+ strResult = objRegEx.Replace(strMatch.Value, "$1")
Next
End If
@@ -296,6 +296,7 @@ Sub FindReplaceInFile(FileName, sFind, sReplace)
Const ForReading = 1
Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII)
+' Wscript.echo("FindReplaceInFile: " & FileName & " s/" & sFind & "/" & sReplace)
sText = fOrgFile.ReadAll
fOrgFile.Close
sText = Replace(sText, sFind, sReplace)
@@ -320,7 +321,7 @@ Function ExecAndGetResult(tmpFolder, VersionDir, execStr)
Do
Loop Until (oExec.Status <> 0) And (oExec.StdOut.atEndOfStream)
- oExec.Terminate
+ oExec.Terminate
WScript.Sleep(500)
FSO.DeleteFile(tmpFolder & "tmpExec.Bat")
@@ -366,6 +367,8 @@ End Function
Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
Dim oExec
+ Wscript.echo("Checking if we're building a newer git version")
+
strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MAJOR")
strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MINOR")
strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MICRO")
@@ -399,7 +402,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
strRevisionHuman = ExecAndGetResult(tmpFolder, VersionDir, "git rev-list -n1 --abbrev=7 --abbrev-commit HEAD")
If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" And strRevisionHuman <> "" Then
- 'Bild version string
+ 'Build version string
strGitVer = "+git~" & strLastCommit & "~" & strRevision
strVerHuman = "git " & strRevisionHuman & " " & strLastCommitHuman
@@ -427,20 +430,37 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
Set sLastFile = Nothing
End If
- If VERSION & " " & strVerHuman <> sLastVersion Then
+ Source = "source code"
+ If FSO.GetExtensionName(includedest) <> "inc" Then
+ Dim IncFn
+
+ IncFn = VersionDir & "\w32\Library\switch_version.inc"
+ If FSO.FileExists(IncFn) Then
+ Wscript.echo("CreateVersion: deleting - " & IncFn)
+ FSO.DeleteFile IncFn
+ End If
+ Else
+ Source = "resource files"
+ End If
+
+ sNewVersion = VERSION & " " & strVerHuman
+ If sNewVersion <> sLastVersion Or not FSO.FileExists(includedest) Then
Dim MyFile
Set MyFile = FSO.CreateTextFile(tmpFolder & "lastversion", True)
- MyFile.WriteLine(VERSION & " " & strVerHuman)
+ MyFile.WriteLine(sNewVersion)
MyFile.Close
Set MyFile = Nothing
+ Wscript.echo("Updating " & Source & " from " & sLastVersion & " to " & sNewVersion)
+
FSO.CopyFile includebase, includedest, true
FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION@", VERSION
FindReplaceInFile includedest, "@SWITCH_VERSION_MAJOR@", strVerMajor
FindReplaceInFile includedest, "@SWITCH_VERSION_MINOR@", strVerMinor
FindReplaceInFile includedest, "@SWITCH_VERSION_MICRO@", strVerMicro
FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION_HUMAN@", strVerHuman
+ FindReplaceInFile includedest, "@SWITCH_VERSION_YEAR@", YEAR(lastChangedDateTime)
End If
End Sub
diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index 030a7e2244..cc8f4aec4d 100644
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -86,8 +86,10 @@ SWITCH_BEGIN_EXTERN_C
#define __FUNCTION__ ""
#endif
#endif
+#ifndef __cplusplus
#undef inline
#define inline __inline
+#endif
#if !defined(_STDINT) && !defined(uint32_t)
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
index 7028e53447..0871cbe1c1 100644
--- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
+++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2010.vcxproj
@@ -67,7 +67,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj
index d15d6faff5..c574a6c08e 100644
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj
+++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -68,15 +68,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -107,18 +100,17 @@
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>.\Release\gsmlib.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/gsmlib.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -130,27 +122,22 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeaderOutputFile>.\Debug/gsmlib.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>.\Debug\gsmlib.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/gsmlib.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -166,25 +153,20 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeaderOutputFile>.\Release/gsmlib.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
- <ObjectFileName>.\Release/</ObjectFileName>
- <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>.\Release\gsmlib.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/gsmlib.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -199,27 +181,22 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeaderOutputFile>.\Debug/gsmlib.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
- <ObjectFileName>.\Debug/</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <AdditionalOptions>/wd4290 /wd4996 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
- <OutputFile>.\Debug\gsmlib.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Debug/gsmlib.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2010.vcxproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2010.vcxproj
index 2429ca905f..c71b738775 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2010.vcxproj
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2010.vcxproj
@@ -92,9 +92,8 @@
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
- <AdditionalOptions>gsmlib.lib ctbd-0.16.lib "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\libteletone\Debug\libteletone.lib" ksuser.lib "..\..\..\..\libs\win32\apr\debug\libapr-1.lib"
-rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\spandsp.lib" %(AdditionalOptions)</AdditionalOptions>
- <AdditionalLibraryDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu\win32\Debug;libctb-0.16\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>
+ </AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -160,6 +159,12 @@ rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\
<ClCompile Include="mod_gsmopen.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\..\libs\spandsp\src\libspandsp.2010.vcxproj">
+ <Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\libs\win32\libcbt\libcbt.2010.vcxproj">
+ <Project>{77bc1dd2-c9a1-44d7-bffa-1320370cacb9}</Project>
+ </ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
</ProjectReference>
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj
index 9edf563cea..30cb1f9fb2 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -96,12 +96,10 @@
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
- <AdditionalOptions>gsmlib.lib ctbd-0.16.lib "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\libteletone\Debug\libteletone.lib" ksuser.lib "..\..\..\..\libs\win32\apr\debug\libapr-1.lib"
-rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\spandsp.lib" %(AdditionalOptions)</AdditionalOptions>
- <AdditionalLibraryDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu\win32\Debug;libctb-0.16\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -111,10 +109,10 @@ rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\
</PrecompiledHeader>
</ClCompile>
<Link>
- <AdditionalOptions>rpcrt4.lib %(AdditionalOptions)</AdditionalOptions>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -130,13 +128,11 @@ rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
- <AdditionalOptions>gsmlib.lib ctbd-0.16.lib "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\libteletone\Debug\libteletone.lib" ksuser.lib "..\..\..\..\libs\win32\apr\debug\libapr-1.lib"
-rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\spandsp.lib" %(AdditionalOptions)</AdditionalOptions>
- <AdditionalLibraryDirectories>gsmlib\gsmlib-1.10-patched-13ubuntu\win32\Debug;libctb-0.16\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -149,10 +145,10 @@ rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\
</PrecompiledHeader>
</ClCompile>
<Link>
- <AdditionalOptions>rpcrt4.lib %(AdditionalOptions)</AdditionalOptions>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -164,6 +160,12 @@ rpcrt4.lib "..\..\..\..\debug\libtiff.lib" "..\..\..\..\libs\spandsp\src\debug\
<ClCompile Include="mod_gsmopen.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\..\..\libs\spandsp\src\libspandsp.2012.vcxproj">
+ <Project>{1cbb0077-18c5-455f-801c-0a0ce7b0bbf5}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\libs\win32\libcbt\libcbt.2012.vcxproj">
+ <Project>{77bc1dd2-c9a1-44d7-bffa-1320370cacb9}</Project>
+ </ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
</ProjectReference>
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index bae1906fe3..9141e05b15 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -86,7 +86,7 @@ SWITCH_MODULE_DEFINITION(mod_gsmopen, mod_gsmopen_load, mod_gsmopen_shutdown, NU
SWITCH_END_EXTERN_C
#define GSMOPEN_CHAT_PROTO "sms"
#if 1
- SWITCH_STANDARD_API(gsm_function);
+ SWITCH_STANDARD_API(gsm_function);
/* BEGIN: Changes here */
#define GSM_SYNTAX "list [full] || console || AT_command || remove < interface_name | interface_id > || reload"
/* END: Changes heres */
@@ -391,7 +391,7 @@ static switch_status_t remove_interface(char *the_interface)
goto end;
}
- LOKKA(tech_pvt->controldev_lock);
+ LOKKA(tech_pvt->controldev_lock);
globals.GSMOPEN_INTERFACES[interface_id].running = 0;
@@ -473,7 +473,7 @@ static switch_status_t remove_interface(char *the_interface)
close(tech_pvt->GSMopenHandles.fdesc[1]);
#endif /* WIN32 */
- UNLOCKA(tech_pvt->controldev_lock);
+ UNLOCKA(tech_pvt->controldev_lock);
switch_mutex_lock(globals.mutex);
if (globals.gsm_console == &globals.GSMOPEN_INTERFACES[interface_id]) {
DEBUGA_GSMOPEN("interface '%s' no more console\n", GSMOPEN_P_LOG, the_interface);
@@ -509,8 +509,6 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
tech_pvt = (private_t *) switch_core_session_get_private(session);
switch_assert(tech_pvt != NULL);
- memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
-
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
//ERRORA("%s CHANNEL INIT\n", GSMOPEN_P_LOG, tech_pvt->name);
@@ -561,7 +559,6 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
}
- memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
switch_core_session_set_private(session, NULL);
} else {
DEBUGA_GSMOPEN("!!!!!!NO tech_pvt!!!! CHANNEL DESTROY %s\n", GSMOPEN_P_LOG, switch_core_session_get_uuid(session));
@@ -760,7 +757,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
if (tech_pvt->no_sound) {
goto cng;
}
- memset(buffer2, 0, sizeof(buffer2));
samples = tech_pvt->serialPort_serial_audio->Read(buffer2, 640);
if (samples >= 320) {
@@ -782,7 +778,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
tech_pvt->buffer2_full = 0;
samples = 320;
DEBUGA_GSMOPEN("samples=%d FROM BUFFER\n", GSMOPEN_P_LOG, samples);
- memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
}
}
@@ -798,7 +793,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
switch_mutex_unlock(tech_pvt->flag_mutex);
if (samples != 320) {
- memset(tech_pvt->buffer2, 0, sizeof(tech_pvt->buffer2));
if (samples != 0) {
DEBUGA_GSMOPEN("samples=%d, goto cng\n", GSMOPEN_P_LOG, samples);
}
@@ -1062,7 +1056,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
private_t *tech_pvt = NULL;
int result;
- if ((*new_session = switch_core_session_request_uuid(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid"))) != 0) {
+ if ((*new_session = switch_core_session_request_uuid(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, flags, pool, switch_event_get_header(var_event, "origination_uuid"))) != 0) {
switch_channel_t *channel = NULL;
switch_caller_profile_t *caller_profile;
diff --git a/w32/Console/FreeSwitchConsole.2012.vcxproj b/w32/Console/FreeSwitchConsole.2012.vcxproj
index 65704ba30b..3867daf1a8 100644
--- a/w32/Console/FreeSwitchConsole.2012.vcxproj
+++ b/w32/Console/FreeSwitchConsole.2012.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -213,6 +213,22 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="FreeSwitchConsole.rc">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\w32\Library</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="switch_version.rc2" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj
index 050c6e65f1..85177378be 100644
--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -138,6 +138,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Command>
</PostBuildEvent>
+ <ResourceCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)src\include</AdditionalIncludeDirectories>
+ </ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<BuildLog />
@@ -792,6 +795,15 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\src\include\switch_version.h;lastversion;%(Outputs)</Outputs>
</CustomBuild>
+ <CustomBuild Include="switch_version.inc.template">
+ <Message>Generating switch_version.inc</Message>
+ <Command>cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)switch_version.inc.template" "$(ProjectDir)switch_version.inc"</Command>
+ <Outputs>$(ProjectDir)switch_version.inc</Outputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$ProjectDir)include\switch_version.h;$(ProjectDir)lastversion</AdditionalInputs>
+ </CustomBuild>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\libs\libteletone\libteletone.2012.vcxproj">
@@ -842,6 +854,21 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="FreeSwitchCoreLib.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_WIN64;_DEBUG</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)</AdditionalIncludeDirectories>
+ <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ShowProgress>
+ <ResourceOutputFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName).res</ResourceOutputFileName>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="switch_version.rc2" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj.filters b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
index 9be028b1c8..6969872267 100644
--- a/w32/Library/FreeSwitchCore.2012.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\src\g711.c">
@@ -335,7 +335,12 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\src\include\switch_version.h.template" />
+ <CustomBuild Include="switch_version.inc.template">
+ <Filter>Version Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\..\src\include\switch_version.h.template">
+ <Filter>Version Files</Filter>
+ </CustomBuild>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
@@ -344,5 +349,18 @@
<Filter Include="Source Files">
<UniqueIdentifier>{a1474195-5783-4c77-977f-59657b38fd01}</UniqueIdentifier>
</Filter>
+ <Filter Include="Version Files">
+ <UniqueIdentifier>{e2733d35-a786-4dc1-b258-dd8885b75c6b}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="FreeSwitchCoreLib.rc">
+ <Filter>Version Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="switch_version.rc2">
+ <Filter>Version Files</Filter>
+ </None>
</ItemGroup>
</Project>
diff --git a/w32/Library/FreeSwitchCoreLib.rc b/w32/Library/FreeSwitchCoreLib.rc
new file mode 100644
index 0000000000..09622ba763
--- /dev/null
+++ b/w32/Library/FreeSwitchCoreLib.rc
@@ -0,0 +1 @@
+#include "switch_version.rc2"
diff --git a/w32/Library/switch_version.inc.template b/w32/Library/switch_version.inc.template
new file mode 100644
index 0000000000..bee3b49fec
--- /dev/null
+++ b/w32/Library/switch_version.inc.template
@@ -0,0 +1,50 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005/2012, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Michael Jerris <mike@jerris.com>
+ * Garmt Boekholt <garmt@cimico.com>
+ *
+ * switch_version.inc --
+ *
+ * This file is generated by switch_version.inc.template. This will end up in a VERSIONINFO resource
+ * so that you can use/show/present version information in freeswitch.dll, the freeswitch consoles and freeswitch.msi installers
+ *
+ * Note: VS20XX/Windows doesn't agree with version numbering like "1.1.1x" and will strip the x off. "1.1.1x => "1.1.1.0"
+ *
+ */
+
+#define TOSTR(x) #x
+#define STR(x) TOSTR(x)
+#define SWITCH_VERSION_MAJOR @SWITCH_VERSION_MAJOR@
+#define SWITCH_VERSION_MAJOR_STR STR(SWITCH_VERSION_MAJOR)
+#define SWITCH_VERSION_MINOR @SWITCH_VERSION_MINOR@
+#define SWITCH_VERSION_MINOR_STR STR(SWITCH_VERSION_MINOR)
+#define SWITCH_VERSION_MICRO @SWITCH_VERSION_MICRO@
+#define SWITCH_VERSION_MICRO_STR STR(SWITCH_VERSION_MICRO)
+#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@"
+#define SWITCH_VERSION_REVISION_HUMAN "@SWITCH_VERSION_REVISION_HUMAN@"
+#define SWITCH_VERSION_YEAR "@SWITCH_VERSION_YEAR@"
+#define SWITCH_VERSION_ALL "@SWITCH_VERSION_MAJOR@.@SWITCH_VERSION_MINOR@.@SWITCH_VERSION_MICRO@"
diff --git a/w32/Library/switch_version.rc2 b/w32/Library/switch_version.rc2
new file mode 100644
index 0000000000..a8785876c6
--- /dev/null
+++ b/w32/Library/switch_version.rc2
@@ -0,0 +1,50 @@
+#include "switch_version.inc"
+#include <verrsrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
+ PRODUCTVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "Comments", "See you at Cluecon!"
+ VALUE "CompanyName", "FreeSWITCH"
+#ifdef _DEBUG
+ #ifdef _WIN64
+ VALUE "FileDescription", "FreeSwitch Core Lib " SWITCH_VERSION_ALL " x64 Debug"
+ #else
+ VALUE "FileDescription", "FreeSwitch Core Lib " SWITCH_VERSION_ALL " x86/win32 Debug"
+ #endif
+#else
+ #ifdef _WIN64
+ VALUE "FileDescription", "FreeSwitch Core Lib " SWITCH_VERSION_ALL " x64 Release"
+ #else
+ VALUE "FileDescription", "FreeSwitch Core Lib " SWITCH_VERSION_ALL " x86/win32 Release"
+ #endif
+#endif
+ VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
+ VALUE "InternalName", "Freeswitch.dll " SWITCH_VERSION_ALL
+ VALUE "LegalCopyright", "� 2005-" SWITCH_VERSION_YEAR " www.freeswitch.org"
+ VALUE "OriginalFilename", "Freeswitch.dll"
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "FreeSwitch Core Library " SWITCH_VERSION_REVISION_HUMAN
+ VALUE "ProductVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
+ VALUE "SpecialBuild", SWITCH_VERSION_REVISION
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END