kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-18 12:39:13 +00:00
Code Issues Projects Releases Wiki Activity

add mod_zeroconf to msvc build, and fix compile error.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@614 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-02-14 18:18:40 +00:00
parent 5d8283c4ad
commit 93d822b66f
5 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/include/switch_loadable_module.h
View File

@ -197,18 +197,18 @@ SWITCH_DECLARE(switch_status) switch_api_execute(char *cmd, char *arg, char *ret
\param filename the path to the module's dll or so file \param filename the path to the module's dll or so file
\return SWITCH_STATUS_SUCCESS on a successful load \return SWITCH_STATUS_SUCCESS on a successful load
*/ */
switch_status switch_module_load(const switch_loadable_module_interface **interface, char *filename); SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename);
switch_status switch_module_reload(void); SWITCH_MOD_DECLARE(switch_status) switch_module_reload(void);
switch_status switch_module_pause(void); SWITCH_MOD_DECLARE(switch_status) switch_module_pause(void);
switch_status switch_module_resume(void); SWITCH_MOD_DECLARE(switch_status) switch_module_resume(void);
switch_status switch_module_status(void); SWITCH_MOD_DECLARE(switch_status) switch_module_status(void);
switch_status switch_module_runtime(void); SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void);
/*! /*!
\brief Shutdown a module \brief Shutdown a module
\return SWITCH_STATUS_SUCCESS on a successful shutdown \return SWITCH_STATUS_SUCCESS on a successful shutdown
*/ */
switch_status switch_module_shutdown(void); SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void);
///\} ///\}
#ifdef __cplusplus #ifdef __cplusplus

14
src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
View File

@ -3,7 +3,7 @@
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_zeroconf" Name="mod_zeroconf"
ProjectGUID="{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}" ProjectGUID="{C7705DC4-2088-493E-AF8D-65BC6D65C125}"
RootNamespace="mod_zeroconf" RootNamespace="mod_zeroconf"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
@ -25,6 +25,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_zeroconf Debug"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -41,7 +42,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -62,9 +63,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies=" libhowld.lib libmDNSResponderd.lib Ws2_32.lib iphlpapi.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Debug&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_zeroconf.pdb" ProgramDatabaseFile="$(OutDir)/mod_zeroconf.pdb"
SubSystem="2" SubSystem="2"
@ -106,6 +108,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_zeroconf Release"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -121,7 +124,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;" AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -140,9 +143,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies=" libhowl.lib libmDNSResponder.lib Ws2_32.lib iphlpapi.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_zeroconf.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\Release&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"

8
w32/vsnet/FreeSwitchCore.vcproj
View File

@ -63,10 +63,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib libhowld.lib libmDNSResponderd.lib" AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib"
OutputFile="$(OutDir)/FreeSwitch.dll" OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\howl\src\lib\howl\Win32\Debug&quot;;&quot;$(InputDir)..\..\libs\howl\src\lib\mDNSResponder\Win32\Debug&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\libs\apr\LibD&quot;;&quot;$(InputDir)..\..\libs\sqlite\Debug&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibD&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
AddModuleNamesToAssembly="" AddModuleNamesToAssembly=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb"
@ -147,10 +147,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib libhowl.lib libmDNSResponder.lib" AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib"
OutputFile="$(OutDir)/FreeSwitch.dll" OutputFile="$(OutDir)/FreeSwitch.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;;&quot;$(InputDir)..\..\libs\howl\src\lib\mDNSResponder\Win32\Release&quot;;&quot;$(InputDir)..\..\libs\howl\src\lib\howl\Win32\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\libs\sqlite\Release&quot;;&quot;$(InputDir)..\..\libs\apr\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-iconv\LibR&quot;;&quot;$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR&quot;;&quot;$(InputDir)..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"

10
w32/vsnet/Freeswitch.sln
View File

@ -135,6 +135,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", ".
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "..\..\src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}"
ProjectSection(ProjectDependencies) = postProject
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -235,6 +240,10 @@ Global
{A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.Build.0 = Debug|Win32 {A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.Build.0 = Debug|Win32
{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.ActiveCfg = Release|Win32 {A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.ActiveCfg = Release|Win32
{A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.Build.0 = Release|Win32 {A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.Build.0 = Release|Win32
{C7705DC4-2088-493E-AF8D-65BC6D65C125}.Debug|Win32.ActiveCfg = Debug|Win32
{C7705DC4-2088-493E-AF8D-65BC6D65C125}.Debug|Win32.Build.0 = Debug|Win32
{C7705DC4-2088-493E-AF8D-65BC6D65C125}.Release|Win32.ActiveCfg = Release|Win32
{C7705DC4-2088-493E-AF8D-65BC6D65C125}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -247,6 +256,7 @@ Global
{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {3A2A7795-C216-4FFF-B8EF-4D17A84BACCC} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {F10BE67C-A8FF-4CB2-AF29-D46D2590DC59} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
{C7705DC4-2088-493E-AF8D-65BC6D65C125} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
{78100236-7CEA-4948-96CC-E8ED3160329C} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {78100236-7CEA-4948-96CC-E8ED3160329C} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{E1794405-29D4-466D-9BE3-DD2344C2A663} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {E1794405-29D4-466D-9BE3-DD2344C2A663} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

9
w32/vsnet/GetLibs.vbs
View File

@ -25,6 +25,7 @@ BuildModsndfile=False
BuildModrawaudio=False BuildModrawaudio=False
BuildModpcre=False BuildModpcre=False
BuildModldap=False BuildModldap=False
BuildModzeroconf=False
BuildSpiderMonkey=False BuildSpiderMonkey=False
quote=Chr(34) quote=Chr(34)
ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))
@ -86,6 +87,8 @@ If objArgs.Count >=1 Then
BuildModpcre=True BuildModpcre=True
Case "Mod_ldap" Case "Mod_ldap"
BuildModldap=True BuildModldap=True
Case "Mod_zeroconf"
BuildModzeroconf=True
Case Else Case Else
BuildCore=True BuildCore=True
BuildModExosip=True BuildModExosip=True
@ -99,6 +102,7 @@ If objArgs.Count >=1 Then
BuildVersion=True BuildVersion=True
BuildModpcre=True BuildModpcre=True
BuildModldap=True BuildModldap=True
BuildModzeroconf=True
End Select End Select
Else Else
BuildCore=True BuildCore=True
@ -113,6 +117,7 @@ Else
BuildVersion=True BuildVersion=True
BuildModldap=True BuildModldap=True
BuildModpcre=True BuildModpcre=True
BuildModzeroconf=True
End If End If
' ****************** ' ******************
@ -139,8 +144,10 @@ If BuildCore Then
FSO.CopyFile LibDestDir & "libresample\include\*.h", LibDestDir & "include" FSO.CopyFile LibDestDir & "libresample\include\*.h", LibDestDir & "include"
BuildLibs_sqlite BuildDebug, BuildRelease BuildLibs_sqlite BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "sqlite\*.h", LibDestDir & "include" FSO.CopyFile LibDestDir & "sqlite\*.h", LibDestDir & "include"
End If
If BuildModzeroconf Then
BuildLibs_howl BuildDebug, BuildRelease BuildLibs_howl BuildDebug, BuildRelease
FSO.CopyFile LibDestDir & "howl\include\*.h", LibDestDir & "include"
End If End If
If BuildModExosip Then If BuildModExosip Then