This commit is contained in:
Jeff Lenk committed 2013-04-08 21:17:02 -05:00
1 parent a152a9a826
commit 5f3160ef0f
62 files changed
+832 -100

No files matched your search

+17 -1
View File
@@ -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>
+28 -1
View File
@@ -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 />
@@ -796,6 +799,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">
@@ -846,7 +858,22 @@ 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>
</Project>
</Project>
@@ -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">
@@ -347,7 +347,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">
@@ -356,5 +361,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>
+1
View File
@@ -0,0 +1 @@
#include "switch_version.rc2"
+50
View File
@@ -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@"
+50
View File
@@ -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