diff --git a/Freeswitch.2008.express.unsupported.sln b/Freeswitch.2008.express.unsupported.sln index c054263e3b..0a2774e792 100644 --- a/Freeswitch.2008.express.unsupported.sln +++ b/Freeswitch.2008.express.unsupported.sln @@ -565,25 +565,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_valet_parking", "src\mo {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32\Download JSON.2008.vcproj", "{B808178B-82F0-4CF4-A2B1-921939FA24D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2008.vcproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}" - ProjectSection(ProjectDependencies) = postProject - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {B808178B-82F0-4CF4-A2B1-921939FA24D0} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2008.vcproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {9778F1C0-09BC-4698-8EBC-BD982247209A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_json_cdr", "src\mod\event_handlers\mod_json_cdr\mod_json_cdr.2008.vcproj", "{EBE7452D-B3F7-4798-8EED-A0DDE2D738F5}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {9778F1C0-09BC-4698-8EBC-BD982247209A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_hash", "src\mod\applications\mod_hash\mod_hash.2008.vcproj", "{2E250296-0C08-4342-9C8A-BCBDD0E7DF65}" @@ -1921,24 +1912,6 @@ Global {432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|Win32.Build.0 = Release|Win32 {432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x64.ActiveCfg = Release|x64 {432DB165-1EB2-4781-A9C0-71E62610B20A}.Release|x64.Build.0 = Release|x64 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|Win32.ActiveCfg = Release|Win32 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.All|x64.ActiveCfg = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/Freeswitch.2008.unsupported.sln b/Freeswitch.2008.unsupported.sln index 6c90369c67..6a6cc37cc4 100644 --- a/Freeswitch.2008.unsupported.sln +++ b/Freeswitch.2008.unsupported.sln @@ -823,14 +823,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applica ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {9778F1C0-09BC-4698-8EBC-BD982247209A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32\Download JSON.2008.vcproj", "{B808178B-82F0-4CF4-A2B1-921939FA24D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2008.vcproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}" - ProjectSection(ProjectDependencies) = postProject - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {B808178B-82F0-4CF4-A2B1-921939FA24D0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2008.vcproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" @@ -2402,28 +2394,6 @@ Global {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|Win32.Build.0 = Release|Win32 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.ActiveCfg = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.Build.0 = Release|x64 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64 @@ -2764,7 +2734,6 @@ Global {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {B376D494-D7DD-4B2A-99E2-52916D5A8CD8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {23B4D303-79FC-49E0-89E2-2280E7E28940} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -2787,7 +2756,6 @@ Global {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D} {21A7DA70-555E-49FA-942B-D84A38B61243} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} diff --git a/Freeswitch.2010.express.sln b/Freeswitch.2010.express.sln index 8b469e9759..c3bafb0ae8 100644 --- a/Freeswitch.2010.express.sln +++ b/Freeswitch.2010.express.sln @@ -282,10 +282,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.201 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2010.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32\Download JSON.2010.vcxproj", "{B808178B-82F0-4CF4-A2B1-921939FA24D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2010.vcxproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2010.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silk_FIX", "libs\silk\src\Silk_FIX.2010.vcxproj", "{56B91D01-9150-4BBF-AFA1-5B68AB991B76}" @@ -5374,82 +5370,6 @@ Global {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|Win32.Build.0 = Release|Win32 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.ActiveCfg = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.Build.0 = Release|x64 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug DirectSound|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug DirectSound|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug DirectSound|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug_RTL_dll|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release DirectSound|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release DirectSound|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release DirectSound|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic_SSE|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic_SSE|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Dynamic|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_RTL_dll|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE2|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE2|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_SSE2|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Static_SSE|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Static_SSE|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release_Static_SSE|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug DirectSound|Win32.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug DirectSound|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug DirectSound|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug_RTL_dll|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release DirectSound|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release DirectSound|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release DirectSound|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic_SSE|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Dynamic|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_RTL_dll|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_RTL_dll|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_RTL_dll|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE2|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE2|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_SSE2|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Static_SSE|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Static_SSE|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release_Static_SSE|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64 @@ -6714,7 +6634,6 @@ Global {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} @@ -6746,7 +6665,6 @@ Global {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln index 4ba6c5ab1e..75ce1a935c 100644 --- a/Freeswitch.2010.sln +++ b/Freeswitch.2010.sln @@ -459,10 +459,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.201 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2010.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32\Download JSON.2010.vcxproj", "{B808178B-82F0-4CF4-A2B1-921939FA24D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2010.vcxproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2010.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silk_FIX", "libs\silk\src\Silk_FIX.2010.vcxproj", "{56B91D01-9150-4BBF-AFA1-5B68AB991B76}" @@ -3074,42 +3070,6 @@ Global {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.Build.0 = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64 Setup.ActiveCfg = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x86 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64 Setup.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x86 Setup.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x86 Setup.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x86 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64 Setup.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x86 Setup.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x86 Setup.ActiveCfg = Release|Win32 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64 @@ -4123,7 +4083,6 @@ Global {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E4D29906-8B73-4F8A-B5F4-CA8BFA648F5A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -4170,7 +4129,6 @@ Global {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D} {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D} {13077E43-E5DF-4EF6-9EB1-2A0B22E8DFAF} = {C120A020-773F-4EA3-923F-B67AF28B750D} diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln index ff675f6ab1..ef9a1c35df 100644 --- a/Freeswitch.2012.sln +++ b/Freeswitch.2012.sln @@ -464,10 +464,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.201 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2012.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32\Download JSON.2012.vcxproj", "{B808178B-82F0-4CF4-A2B1-921939FA24D0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2012.vcxproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2012.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silk_FIX", "libs\silk\src\Silk_FIX.2012.vcxproj", "{56B91D01-9150-4BBF-AFA1-5B68AB991B76}" @@ -3086,42 +3082,6 @@ Global {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64.Build.0 = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x64 Setup.ActiveCfg = Release|x64 {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}.Release|x86 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x64 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.All|x86 Setup.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|Win32.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64.Build.0 = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x64 Setup.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Debug|x86 Setup.ActiveCfg = Debug|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|Win32.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64.Build.0 = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x64 Setup.ActiveCfg = Release|Win32 - {B808178B-82F0-4CF4-A2B1-921939FA24D0}.Release|x86 Setup.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|Win32.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x64 Setup.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.All|x86 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|Win32.Build.0 = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.Build.0 = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64 Setup.ActiveCfg = Debug|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x86 Setup.ActiveCfg = Debug|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.Build.0 = Release|Win32 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.Build.0 = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64 Setup.ActiveCfg = Release|x64 - {9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x86 Setup.ActiveCfg = Release|Win32 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64 @@ -4208,7 +4168,6 @@ Global {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {9778F1C0-09BC-4698-8EBC-BD982247209A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E4D29906-8B73-4F8A-B5F4-CA8BFA648F5A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -4256,7 +4215,6 @@ Global {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {B808178B-82F0-4CF4-A2B1-921939FA24D0} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D} {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D} {13077E43-E5DF-4EF6-9EB1-2A0B22E8DFAF} = {C120A020-773F-4EA3-923F-B67AF28B750D} diff --git a/debian/util.sh b/debian/util.sh index 830947765f..a30e5bf260 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -99,7 +99,6 @@ getlib () { getlibs () { # get pinned libraries getlib http://downloads.mongodb.org/cxx-driver/mongodb-linux-x86_64-v1.8-latest.tgz - getlib http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz getlib http://files.freeswitch.org/downloads/libs/soundtouch-1.7.1.tar.gz getlib http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 getlib http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz diff --git a/freeswitch.spec b/freeswitch.spec index 6981ae3f58..86f33017fe 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -126,10 +126,9 @@ Source7: http://files.freeswitch.org/downloads/libs/soundtouch-1.7.1.tar.gz Source8: http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz Source9: http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz Source10: http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz -Source11: http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz -Source12: http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz -Source13: http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 -Source14: http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz +Source11: http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz +Source12: http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 +Source13: http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz Prefix: %{prefix} diff --git a/libs/win32/Download JSON.2008.vcproj b/libs/win32/Download JSON.2008.vcproj deleted file mode 100644 index 91e82fc2de..0000000000 --- a/libs/win32/Download JSON.2008.vcproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/win32/Download JSON.2010.vcxproj b/libs/win32/Download JSON.2010.vcxproj deleted file mode 100644 index cb82ed6830..0000000000 --- a/libs/win32/Download JSON.2010.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download JSON - {B808178B-82F0-4CF4-A2B1-921939FA24D0} - Download JSON - Win32Proj - - - - Utility - MultiByte - - - Utility - MultiByte - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\JSON\$(Configuration)\ - $(PlatformName)\JSON\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\json-c-0.9;%(Outputs) - Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\json-c-0.9;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download JSON.2012.vcxproj b/libs/win32/Download JSON.2012.vcxproj deleted file mode 100644 index 114131db28..0000000000 --- a/libs/win32/Download JSON.2012.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download JSON - {B808178B-82F0-4CF4-A2B1-921939FA24D0} - Download JSON - Win32Proj - - - - Utility - MultiByte - v110 - - - Utility - MultiByte - v110 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\JSON\$(Configuration)\ - $(PlatformName)\JSON\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\json-c-0.9;%(Outputs) - Downloading JSON. - if not exist "$(ProjectDir)..\json-c-0.9" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/json-c-0.9.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\json-c-0.9;%(Outputs) - - - - - - diff --git a/libs/win32/json/config.h b/libs/win32/json/config.h deleted file mode 100644 index a671ddf783..0000000000 --- a/libs/win32/json/config.h +++ /dev/null @@ -1,2 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - diff --git a/libs/win32/json/libjson.2008.vcproj b/libs/win32/json/libjson.2008.vcproj deleted file mode 100644 index 5c09e5413c..0000000000 --- a/libs/win32/json/libjson.2008.vcproj +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/win32/json/libjson.2010.vcxproj b/libs/win32/json/libjson.2010.vcxproj deleted file mode 100644 index a371ac2f46..0000000000 --- a/libs/win32/json/libjson.2010.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libjson - {9778F1C0-09BC-4698-8EBC-BD982247209A} - json - Win32Proj - - - - StaticLibrary - Unicode - true - - - StaticLibrary - Unicode - - - StaticLibrary - Unicode - true - - - StaticLibrary - Unicode - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - Disabled - .;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - X64 - - - Disabled - .;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - MaxSpeed - true - .;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - - - - - X64 - - - MaxSpeed - true - .;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - - - - - - - - - - - - - - - - - {b808178b-82f0-4cf4-a2b1-921939fa24d0} - false - - - - - - \ No newline at end of file diff --git a/libs/win32/json/libjson.2010.vcxproj.filters b/libs/win32/json/libjson.2010.vcxproj.filters deleted file mode 100644 index 9de2aac08f..0000000000 --- a/libs/win32/json/libjson.2010.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/libs/win32/json/libjson.2012.vcxproj b/libs/win32/json/libjson.2012.vcxproj deleted file mode 100644 index 21fb08793e..0000000000 --- a/libs/win32/json/libjson.2012.vcxproj +++ /dev/null @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libjson - {9778F1C0-09BC-4698-8EBC-BD982247209A} - json - Win32Proj - - - - StaticLibrary - Unicode - true - v110 - - - StaticLibrary - Unicode - v110 - - - StaticLibrary - Unicode - true - v110 - - - StaticLibrary - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - Disabled - .;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - 4018;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - Disabled - .;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - 4244;4996;%(DisableSpecificWarnings) - - - - - MaxSpeed - true - .;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - 4018;4244;4996;%(DisableSpecificWarnings) - - - - - X64 - - - MaxSpeed - true - .;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_STDARG_H;STDC_HEADERS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - 4244;4996;%(DisableSpecificWarnings) - - - - - - - - - - - - - - - - - {b808178b-82f0-4cf4-a2b1-921939fa24d0} - false - - - - - - diff --git a/libs/win32/json/libjson.2012.vcxproj.filters b/libs/win32/json/libjson.2012.vcxproj.filters deleted file mode 100644 index 9de2aac08f..0000000000 --- a/libs/win32/json/libjson.2012.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/src/mod/applications/mod_curl/Makefile.am b/src/mod/applications/mod_curl/Makefile.am index 06ca05cb09..8ce420c7e5 100644 --- a/src/mod/applications/mod_curl/Makefile.am +++ b/src/mod/applications/mod_curl/Makefile.am @@ -1,33 +1,9 @@ include $(top_srcdir)/build/modmake.rulesam - -AUTOMAKE_OPTIONS += foreign MODNAME=mod_curl -JSON_C=json-c-0.9 -JSON_DIR=$(switch_srcdir)/libs/$(JSON_C) -JSON_BUILDDIR=$(switch_builddir)/libs/$(JSON_C) -JSONLA=$(JSON_BUILDDIR)/libjson.la - mod_LTLIBRARIES = mod_curl.la mod_curl_la_SOURCES = mod_curl.c -mod_curl_la_CFLAGS = $(AM_CFLAGS) -I$(JSON_DIR) +mod_curl_la_CFLAGS = $(AM_CFLAGS) mod_curl_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -mod_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(JSONLA) +mod_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_curl_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared - -BUILT_SOURCES=$(JSONLA) - -$(JSON_DIR): - $(GETLIB) $(JSON_C).tar.gz - -$(JSON_BUILDDIR)/Makefile: $(JSON_DIR) - mkdir -p $(JSON_BUILDDIR) - cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS= - $(TOUCH_TARGET) - -$(JSONLA): $(JSON_BUILDDIR)/Makefile - cd $(JSON_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) - - - diff --git a/src/mod/applications/mod_curl/mod_curl.2008.vcproj b/src/mod/applications/mod_curl/mod_curl.2008.vcproj index 9502c8e628..7ce6b1ffec 100644 --- a/src/mod/applications/mod_curl/mod_curl.2008.vcproj +++ b/src/mod/applications/mod_curl/mod_curl.2008.vcproj @@ -42,7 +42,7 @@ /> @@ -106,7 +106,7 @@ /> @@ -171,7 +171,7 @@ /> @@ -235,7 +235,7 @@ /> diff --git a/src/mod/applications/mod_curl/mod_curl.2010.vcxproj b/src/mod/applications/mod_curl/mod_curl.2010.vcxproj index 901098c7fa..15a52ee9ab 100644 --- a/src/mod/applications/mod_curl/mod_curl.2010.vcxproj +++ b/src/mod/applications/mod_curl/mod_curl.2010.vcxproj @@ -66,7 +66,7 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -82,7 +82,7 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -96,7 +96,7 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -112,7 +112,7 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -132,10 +132,6 @@ {87ee9da4-de1e-4448-8324-183c98dca588} false - - {9778f1c0-09bc-4698-8ebc-bd982247209a} - false - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} @@ -150,4 +146,4 @@ - \ No newline at end of file + diff --git a/src/mod/applications/mod_curl/mod_curl.2012.vcxproj b/src/mod/applications/mod_curl/mod_curl.2012.vcxproj index fbd83b85b5..a0be91b78a 100644 --- a/src/mod/applications/mod_curl/mod_curl.2012.vcxproj +++ b/src/mod/applications/mod_curl/mod_curl.2012.vcxproj @@ -70,7 +70,7 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -86,7 +86,7 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -100,7 +100,7 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -116,7 +116,7 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(RootDir)%(Directory)..\..\..\..\libs\json-c-0.9;%(AdditionalIncludeDirectories) + %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -136,10 +136,6 @@ {87ee9da4-de1e-4448-8324-183c98dca588} false - - {9778f1c0-09bc-4698-8ebc-bd982247209a} - false - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj index d330aba5d8..b126d44ffb 100644 --- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj +++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj @@ -42,7 +42,7 @@ />