add mod_zeroconf to msvc build, and fix compile error.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@614 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index adc9572a9d8729d1bbca2deacaae6c32531abf9f..1d0277b704297a83421f0252c9326f1512be8f88 100644 (file)
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -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
   \return SWITCH_STATUS_SUCCESS on a successful load
 */
-switch_status switch_module_load(const switch_loadable_module_interface **interface, char *filename);
-switch_status switch_module_reload(void);
-switch_status switch_module_pause(void);
-switch_status switch_module_resume(void);
-switch_status switch_module_status(void);
-switch_status switch_module_runtime(void);
+SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename);
+SWITCH_MOD_DECLARE(switch_status) switch_module_reload(void);
+SWITCH_MOD_DECLARE(switch_status) switch_module_pause(void);
+SWITCH_MOD_DECLARE(switch_status) switch_module_resume(void);
+SWITCH_MOD_DECLARE(switch_status) switch_module_status(void);
+SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void);
 
 /*!
   \brief Shutdown a module
   \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

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

diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index fee49220243acb0fb921ead8ac4d0a707d54ad76..8dd4d032d4ff00d5b7af8c99ae7439e80a4fec15 100644 (file)
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -63,10 +63,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               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"\r
+                               AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresampled.lib"\r
                                OutputFile="$(OutDir)/FreeSwitch.dll"\r
                                LinkIncremental="2"\r
-                               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;"\r
+                               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;"\r
                                AddModuleNamesToAssembly=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb"\r
@@ -147,10 +147,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               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"\r
+                               AdditionalDependencies="Ws2_32.lib Mswsock.lib apr-1.lib sqlite.lib apriconv-1.lib aprutil-1.lib xml.lib Rpcrt4.lib libresample.lib"\r
                                OutputFile="$(OutDir)/FreeSwitch.dll"\r
                                LinkIncremental="1"\r
-                               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;"\r
+                               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;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

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

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