kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 01:26:58 +00:00
Code Issues Projects Releases Wiki Activity

windows build update to use more dynamic libs, fix some type issues, and fix jrtp build.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@862 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2006-03-17 02:45:19 +00:00
parent 0673070b11
commit a2c448e118
39 changed files with 4297 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/jrtplib/jrtplib.def Normal file
View File

@@ -0,0 +1,13 @@
EXPORTS
jrtp4c_new
jrtp4c_destroy
jrtp4c_get_rtp_socket
jrtp4c_set_invald_handler
jrtp4c_read
jrtp4c_write
jrtp4c_write_payload
jrtp4c_start
jrtp4c_get_ssrc
jrtp4c_killread
jrtp4c_set_private
jrtp4c_get_private

46
libs/jrtplib/jrtplib.sln
View File

@@ -1,20 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "jrtplib.vcproj", "{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.ActiveCfg = Debug|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.Build.0 = Debug|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.ActiveCfg = Release|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "jrtplib.vcproj", "{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Dll|Win32 = Debug Dll|Win32
Debug|Win32 = Debug|Win32
Release Dll|Win32 = Release Dll|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug Dll|Win32.ActiveCfg = Debug Dll|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug Dll|Win32.Build.0 = Debug Dll|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.ActiveCfg = Debug|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Debug|Win32.Build.0 = Debug|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release Dll|Win32.ActiveCfg = Release Dll|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release Dll|Win32.Build.0 = Release Dll|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.ActiveCfg = Release|Win32
{D2A2E3F7-BF5F-4D92-A167-1AF302E20950}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

154
libs/jrtplib/jrtplib.vcproj
View File

@@ -42,7 +42,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
@@ -101,7 +101,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="./src;../jthread-1.1.2/src"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
@@ -135,6 +135,152 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug Dll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./src;../jthread-1.1.2/src"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib "
ModuleDefinitionFile="jrtplib.def"
OptimizeReferences="1"
EnableCOMDATFolding="1"
OptimizeForWindows98="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release Dll|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="./src;../jthread-1.1.2/src"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib "
ModuleDefinitionFile="jrtplib.def"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
@@ -471,6 +617,10 @@
>
</File>
</Filter>
<File
RelativePath=".\jrtplib.def"
>
</File>
</Files>
<Globals>
</Globals>

4
libs/jrtplib/src/jrtp4c.h
View File

@@ -45,12 +45,14 @@ typedef enum {
#ifndef uint32_t
#ifdef WIN32
typedef unsigned int uint32_t;
typedef unsigned __int16 uint16_t;
#else
#include <stdint.h>
#endif
#endif
#ifdef WIN32
typedef SOCKET jrtp_sock_t;
typedef SOCKET jrtp_socket_t;
#else
typedef int jrtp_socket_t;
#endif

2
libs/jrtplib/src/rtpconfig.h
View File

@@ -35,10 +35,8 @@
#define RTPCONFIG_H
#if (defined(WIN32) || defined(_WIN32_WCE))
typedef SOCKET jrtp_socket_t;
#include "rtpconfig_win.h"
#else
typedef int jrtp_socket_t;
#include "rtpconfig_unix.h"
#endif // WIN32

4
libs/jrtplib/src/rtptransmitter.h
View File

@@ -61,8 +61,8 @@ public:
virtual int Create(size_t maxpacksize,const RTPTransmissionParams *transparams) = 0;
virtual void Destroy() = 0;
virtual jrtp_socket_t GetRTPSocket() {}
virtual jrtp_socket_t GetRTCPSocket() {}
virtual jrtp_socket_t GetRTPSocket() = 0;
virtual jrtp_socket_t GetRTCPSocket() = 0;
// The user MUST delete the returned instance when it is no longer needed
virtual RTPTransmissionInfo *GetTransmissionInfo() = 0;

2
libs/jrtplib/src/rtptypes.h
View File

@@ -32,6 +32,8 @@
#if ! (defined(WIN32) || defined(_WIN32_WCE))
#include "rtptypes_unix.h"
typedef int jrtp_socket_t;
#else
#include "rtptypes_win.h"
typedef SOCKET jrtp_socket_t;
#endif // WIN32