diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj index 8dd4d032d4..fee4922024 100644 --- a/w32/vsnet/FreeSwitchCore.vcproj +++ b/w32/vsnet/FreeSwitchCore.vcproj @@ -63,10 +63,10 @@ /> <Tool 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" + 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" OutputFile="$(OutDir)/FreeSwitch.dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Debug";"$(InputDir)..\..\libs\apr\LibD";"$(InputDir)..\..\libs\sqlite\Debug";"$(InputDir)..\..\libs\apr-util\LibD";"$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD";"$(InputDir)..\..\libs\apr-iconv\LibD";"$(InputDir)..\..\libs\libresample\win"" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Debug";"$(InputDir)..\..\libs\apr\LibD";"$(InputDir)..\..\libs\sqlite\Debug";"$(InputDir)..\..\libs\apr-util\LibD";"$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibD";"$(InputDir)..\..\libs\apr-iconv\LibD";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\howl\src\lib\howl\Win32\Debug";"$(InputDir)..\..\libs\howl\src\lib\mDNSResponder\Win32\Debug"" AddModuleNamesToAssembly="" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" @@ -147,10 +147,10 @@ /> <Tool 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" + 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" OutputFile="$(OutDir)/FreeSwitch.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Release";"$(InputDir)..\..\libs\sqlite\Release";"$(InputDir)..\..\libs\apr\LibR";"$(InputDir)..\..\libs\apr-util\LibR";"$(InputDir)..\..\libs\apr-iconv\LibR";"$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR";"$(InputDir)..\..\libs\libresample\win"" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Release";"$(InputDir)..\..\libs\sqlite\Release";"$(InputDir)..\..\libs\apr\LibR";"$(InputDir)..\..\libs\apr-util\LibR";"$(InputDir)..\..\libs\apr-iconv\LibR";"$(InputDir)..\..\libs\apr-util\xml\expat\lib\LibR";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\howl\src\lib\mDNSResponder\Win32\Release";"$(InputDir)..\..\libs\howl\src\lib\howl\Win32\Release"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs index e87574e663..9a854dbd42 100644 --- a/w32/vsnet/GetLibs.vbs +++ b/w32/vsnet/GetLibs.vbs @@ -139,6 +139,8 @@ If BuildCore Then FSO.CopyFile LibDestDir & "libresample\include\*.h", LibDestDir & "include" BuildLibs_sqlite BuildDebug, BuildRelease FSO.CopyFile LibDestDir & "sqlite\*.h", LibDestDir & "include" + BuildLibs_howl BuildDebug, BuildRelease + FSO.CopyFile LibDestDir & "howl\include\*.h", LibDestDir & "include" End If If BuildModExosip Then @@ -538,6 +540,35 @@ Sub BuildLibs_libsndfile(BuildDebug, BuildRelease) End If End Sub +Sub BuildLibs_howl(BuildDebug, BuildRelease) + If Not FSO.FolderExists(LibDestDir & "howl") Then + WgetUnTarGz LibsBase & "howl-1.0.0.tar.gz", LibDestDir + RenameFolder LibDestDir & "howl-1.0.0", "howl" + FSO.CopyFile Utilsdir & "howl\libhowl.vcproj", LibDestDir & "howl\src\lib\howl\Win32\", True + FSO.CopyFile Utilsdir & "howl\libmDNSResponder.vcproj", LibDestDir & "howl\src\lib\mDNSResponder\Win32\", True + End If + If FSO.FolderExists(LibDestDir & "howl") Then + If BuildDebug Then + If Not FSO.FileExists(LibDestDir & "howl\src\lib\howl\Win32\Debug\libhowld.lib") Then + BuildViaVCBuild LibDestDir & "howl\src\lib\howl\Win32\libhowl.vcproj", "Debug" + End If + If Not FSO.FileExists(LibDestDir & "howl\src\lib\mDNSResponder\Win32\Debug\libmDNSResponderd.lib") Then + BuildViaVCBuild LibDestDir & "howl\src\lib\mDNSResponder\Win32\libmDNSResponder.vcproj", "Debug" + End If + End If + If BuildRelease Then + If Not FSO.FileExists(LibDestDir & "howl\src\lib\howl\Win32\Release\libhowl.lib") Then + BuildViaVCBuild LibDestDir & "howl\src\lib\howl\Win32\libhowl.vcproj", "Release" + End If + If Not FSO.FileExists(LibDestDir & "howl\src\lib\mDNSResponder\Win32\Release\libmDNSResponder.lib") Then + BuildViaVCBuild LibDestDir & "howl\src\lib\mDNSResponder\Win32\libmDNSResponder.vcproj", "Release" + End If + End If + Else + Wscript.echo "Unable to download howl" + End If +End Sub + Sub BuildLibs_libresample(BuildDebug, BuildRelease) If Not FSO.FolderExists(LibDestDir & "libresample") Then WgetUnZip LibsBase & "libresample-0.1.3.zip", LibDestDir diff --git a/w32/vsnet/Tools/howl/libhowl.vcproj b/w32/vsnet/Tools/howl/libhowl.vcproj new file mode 100644 index 0000000000..f387d57d06 --- /dev/null +++ b/w32/vsnet/Tools/howl/libhowl.vcproj @@ -0,0 +1,370 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="howl static library" + ProjectGUID="{0D826AF5-0506-4C50-BB8B-7DB019AC21AE}" + RootNamespace="howl static library" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug Static" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../../include, ../" + PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libhowld.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release Static" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="true" + AdditionalIncludeDirectories="../../../../include, ../" + PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libhowl.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + <File + RelativePath="..\address.c" + > + </File> + <File + RelativePath="..\buffer.c" + > + </File> + <File + RelativePath="..\channel.c" + > + </File> + <File + RelativePath="..\debug.c" + > + </File> + <File + RelativePath="..\discovery.c" + > + </File> + <File + RelativePath="..\interface.c" + > + </File> + <File + RelativePath="..\ior.c" + > + </File> + <File + RelativePath="..\message.c" + > + </File> + <File + RelativePath="..\NotOSX\notosx_mdns_stub.c" + > + </File> + <File + RelativePath="..\object.c" + > + </File> + <File + RelativePath="..\orb.c" + > + </File> + <File + RelativePath="..\platform.c" + > + </File> + <File + RelativePath="..\profile.c" + > + </File> + <File + RelativePath="..\salt.c" + > + </File> + <File + RelativePath="..\signal.c" + > + </File> + <File + RelativePath="..\socket.c" + > + </File> + <File + RelativePath="..\text_record.c" + > + </File> + <File + RelativePath="..\time.c" + > + </File> + <File + RelativePath=".\win32_interface.c" + > + </File> + <File + RelativePath=".\win32_salt.c" + > + </File> + <File + RelativePath=".\win32_socket.c" + > + </File> + <File + RelativePath=".\win32_time.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc" + > + <File + RelativePath="..\buffer_i.h" + > + </File> + <File + RelativePath="..\channel_i.h" + > + </File> + <File + RelativePath="..\..\..\..\include\salt\debug.h" + > + </File> + <File + RelativePath="..\..\..\..\include\discovery\discovery.h" + > + </File> + <File + RelativePath=".\discovery_i.h" + > + </File> + <File + RelativePath=".\interface_i.h" + > + </File> + <File + RelativePath=".\ior.h" + > + </File> + <File + RelativePath=".\message_i.h" + > + </File> + <File + RelativePath="..\NotOSX\notosx_mdns_stub.h" + > + </File> + <File + RelativePath="..\object_i.h" + > + </File> + <File + RelativePath="..\orb_i.h" + > + </File> + <File + RelativePath="..\..\..\..\include\salt\platform.h" + > + </File> + <File + RelativePath="..\profile.h" + > + </File> + <File + RelativePath=".\resource.h" + > + </File> + <File + RelativePath="..\salt_i.h" + > + </File> + <File + RelativePath="..\signal_i.h" + > + </File> + <File + RelativePath="..\socket_i.h" + > + </File> + <File + RelativePath="..\..\..\..\include\discovery\text_record.h" + > + </File> + <File + RelativePath="..\text_record_i.h" + > + </File> + <File + RelativePath="..\time_i.h" + > + </File> + <File + RelativePath="..\tlist.h" + > + </File> + <File + RelativePath=".\win32_interface.h" + > + </File> + <File + RelativePath=".\win32_mdns.h" + > + </File> + <File + RelativePath=".\win32_salt.h" + > + </File> + <File + RelativePath=".\win32_socket.h" + > + </File> + <File + RelativePath=".\win32_time.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + <File + RelativePath="ReadMe.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/w32/vsnet/Tools/howl/libmDNSResponder.vcproj b/w32/vsnet/Tools/howl/libmDNSResponder.vcproj new file mode 100644 index 0000000000..c83c8dd913 --- /dev/null +++ b/w32/vsnet/Tools/howl/libmDNSResponder.vcproj @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mDNSResponder static library" + ProjectGUID="{49C34584-B6DA-448F-83CF-27584DC9FC90}" + RootNamespace="mDNSResponder static library" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug Static" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../../../include;../../howl;.." + PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libmDNSResponderd.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release Static" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="true" + AdditionalIncludeDirectories="../../../../include;../../howl;.." + PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libmDNSResponder.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + <File + RelativePath="..\DNSServices.c" + > + </File> + <File + RelativePath="..\mDNS.c" + > + </File> + <File + RelativePath="..\mDNSPlatform.c" + > + </File> + <File + RelativePath="..\mDNSServant.c" + > + </File> + <File + RelativePath="win32_mdns.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc" + > + <File + RelativePath="..\DNSServices.h" + > + </File> + <File + RelativePath="..\mDNSClientAPI.h" + > + </File> + <File + RelativePath="..\mDNSDebug.h" + > + </File> + <File + RelativePath="..\mDNSPlatform.h" + > + </File> + <File + RelativePath="..\mDNSPlatformFunctions.h" + > + </File> + <File + RelativePath="..\mDNSServant.h" + > + </File> + <File + RelativePath=".\resource.h" + > + </File> + <File + RelativePath="win32_mdns.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + <File + RelativePath="ReadMe.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>