]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7338: remove libsndfile from tree, use system lib instead
authorMichael Jerris <mike@jerris.com>
Mon, 30 Mar 2015 16:17:08 +0000 (12:17 -0400)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:24 +0000 (12:47 -0500)
FS-7338: remove libsilk from tree, use system lib instead
FS-7338: change to always use system liblua
FS-7338: remove libbroadvoice from tree, use system lib instead
FS-7338: remove libilbc from tree, use system lib instead
FS-7338: remove libs using system libs from bootstrap
FS-7338: remove libg722_1 from tree, use system lib instead
FS-7338: remove mod_celt, it has be superseded by mod_opus
FS-7338: remove libcodec2 from tree, use system lib instead
FS-7338: remove libopus from tree, use system lib instead
FS-7338: remove libsoundtouch build from tree, use system lib instead
FS-7338: remove flite build from tree, use system lib instead
FS-7338: remove openldap build from tree, use system lib instead
FS-7338: remove libmongoc build from tree, use system lib instead
FS-7338: remove mod_mongo deps that are no longer actually required
FS-7338: remove some dup demo modules and don't include demo code in packages

49 files changed:
Freeswitch.2008.unsupported.sln
Freeswitch.2010.express.sln
Freeswitch.2010.sln
Freeswitch.2012.sln
bootstrap.sh
build/modules.conf.in
conf/rayo/autoload_configs/modules.conf.xml
conf/softphone/freeswitch.xml
conf/vanilla/autoload_configs/modules.conf.xml
configure.ac
debian/bootstrap.sh
debian/control-modules
debian/copyright
debian/util.sh
freeswitch-config-rayo.spec
freeswitch.spec
fscomm/conf/freeswitch.xml
libs/win32/Download CELT.2012.vcxproj [deleted file]
libs/win32/Download CELT.vcproj [deleted file]
libs/win32/Download CELT.vcxproj [deleted file]
libs/win32/celt/libcelt.2012.vcxproj [deleted file]
libs/win32/celt/libcelt.2012.vcxproj.filters [deleted file]
libs/win32/celt/libcelt.vcproj [deleted file]
libs/win32/celt/libcelt.vcxproj [deleted file]
libs/win32/celt/libcelt.vcxproj.filters [deleted file]
scripts/freeswitch.pkg_deps.sh
src/include/switch.h
src/mod/applications/mod_mongo/Makefile.am
src/mod/applications/mod_snipe_hunt/Makefile.am [deleted file]
src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.2008.vcproj [deleted file]
src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.c [deleted file]
src/mod/applications/mod_soundtouch/Makefile.am
src/mod/asr_tts/mod_flite/Makefile.am
src/mod/codecs/mod_bv/Makefile.am
src/mod/codecs/mod_celt/Makefile.am [deleted file]
src/mod/codecs/mod_celt/mod_celt.2012.vcxproj [deleted file]
src/mod/codecs/mod_celt/mod_celt.c [deleted file]
src/mod/codecs/mod_celt/mod_celt.vcproj [deleted file]
src/mod/codecs/mod_celt/mod_celt.vcxproj [deleted file]
src/mod/codecs/mod_codec2/Makefile.am
src/mod/codecs/mod_ilbc/Makefile.am
src/mod/codecs/mod_opus/Makefile.am
src/mod/codecs/mod_silk/Makefile.am
src/mod/codecs/mod_siren/Makefile.am
src/mod/directories/mod_ldap/Makefile.am
src/mod/formats/mod_sndfile/Makefile.am
src/mod/xml_int/mod_xml_ldap/Makefile.am
w32/Setup/Setup.wixproj
w32/Setup/inno_setup/fscomm.iss

index 6a6cc37cc42ce0e50582e8e4589c04b3f636ca9c..e8894407ecfbd66b5fa2cae386dc0eb48c88bbc1 100644 (file)
@@ -801,19 +801,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_
                {B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CELT", "libs\win32\Download CELT.vcproj", "{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.vcproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}\r
-       EndProjectSection\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_celt", "src\mod\codecs\mod_celt\mod_celt.vcproj", "{4D418176-3B33-47E6-A63E-01BA34ADD21C}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {ABB71A76-42B0-47A4-973A-42E3D920C6FD}\r
-       EndProjectSection\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2008.vcproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
@@ -2343,39 +2330,6 @@ Global
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.Build.0 = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.Build.0 = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.Build.0 = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.Build.0 = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.Build.0 = Release|x64\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.Build.0 = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64.ActiveCfg = Release|Win32\r
@@ -2638,7 +2592,6 @@ Global
                {0B6C905B-142E-4999-B39D-92FF7951E921} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
@@ -2733,7 +2686,6 @@ Global
                {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {B376D494-D7DD-4B2A-99E2-52916D5A8CD8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {23B4D303-79FC-49E0-89E2-2280E7E28940} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
@@ -2755,7 +2707,6 @@ Global
                {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {21A7DA70-555E-49FA-942B-D84A38B61243} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}\r
index c3bafb0ae886fc1049c7054cabbde55aee0d874e..d9b1d2802f21bbf2aba885be74e747af1480f6ee 100644 (file)
@@ -272,12 +272,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\unimrc
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp\modules\mrcp-unirtsp\mrcpunirtsp.2010.vcxproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CELT", "libs\win32\Download CELT.vcxproj", "{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_celt", "src\mod\codecs\mod_celt\mod_celt.vcxproj", "{4D418176-3B33-47E6-A63E-01BA34ADD21C}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2010.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2010.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}"\r
@@ -5184,120 +5178,6 @@ Global
                {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32\r
                {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|x64\r
                {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.Build.0 = Release|x64\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug DirectSound|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug DirectSound|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug DirectSound|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug_RTL_dll|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release DirectSound|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release DirectSound|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release DirectSound|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic_SSE|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic_SSE|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Dynamic|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_RTL_dll|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_RTL_dll|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE2|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE2|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_SSE2|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Static_SSE|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Static_SSE|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release_Static_SSE|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug DirectSound|Win32.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug DirectSound|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug DirectSound|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug_RTL_dll|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.Build.0 = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release DirectSound|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release DirectSound|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release DirectSound|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic_SSE|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Dynamic|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_RTL_dll|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_RTL_dll|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_RTL_dll|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE2|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE2|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_SSE2|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Static_SSE|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Static_SSE|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release_Static_SSE|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.Build.0 = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug DirectSound|Win32.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug DirectSound|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug DirectSound|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug_RTL_dll|Win32.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug_RTL_dll|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug_RTL_dll|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.Build.0 = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release DirectSound|Win32.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release DirectSound|x64.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release DirectSound|x64.Build.0 = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic_SSE|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic_SSE|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic_SSE|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Dynamic|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_RTL_dll|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_RTL_dll|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_RTL_dll|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE2|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE2|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_SSE2|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Static_SSE|Win32.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Static_SSE|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release_Static_SSE|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.Build.0 = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.Build.0 = Release|x64\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.Build.0 = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64.ActiveCfg = Release|Win32\r
@@ -6549,7 +6429,6 @@ Global
                {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {0B6C905B-142E-4999-B39D-92FF7951E921} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
@@ -6633,7 +6512,6 @@ Global
                {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC}\r
@@ -6664,7 +6542,6 @@ Global
                {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}\r
                {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}\r
                {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}\r
index 75ce1a935c997efd33c409f161796d5f1f78da49..8edd10ea7a9e13e0340d0ed618fc16b1bbfd3847 100644 (file)
@@ -449,12 +449,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2010.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CELT", "libs\win32\Download CELT.vcxproj", "{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_celt", "src\mod\codecs\mod_celt\mod_celt.vcxproj", "{4D418176-3B33-47E6-A63E-01BA34ADD21C}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2010.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2010.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}"\r
@@ -2984,60 +2978,6 @@ Global
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64 Setup.ActiveCfg = Release|x64\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64 Setup.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x86 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.Build.0 = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64 Setup.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.Build.0 = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64 Setup.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64 Setup.Build.0 = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x86 Setup.ActiveCfg = Release Passthrough|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.Build.0 = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64 Setup.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.Build.0 = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64 Setup.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x86 Setup.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.Build.0 = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64.ActiveCfg = Release|Win32\r
@@ -3992,7 +3932,6 @@ Global
                {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {0B6C905B-142E-4999-B39D-92FF7951E921} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
@@ -4082,7 +4021,6 @@ Global
                {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {E4D29906-8B73-4F8A-B5F4-CA8BFA648F5A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
@@ -4128,7 +4066,6 @@ Global
                {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {13077E43-E5DF-4EF6-9EB1-2A0B22E8DFAF} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
index ef9a1c35df405dcb3d5bcf61934c9e254af92871..6dbe7b7c243949aa45607cb7fd39157414f70bf9 100644 (file)
@@ -454,12 +454,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2012.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CELT", "libs\win32\Download CELT.2012.vcxproj", "{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2012.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_celt", "src\mod\codecs\mod_celt\mod_celt.2012.vcxproj", "{4D418176-3B33-47E6-A63E-01BA34ADD21C}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2012.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applications\mod_curl\mod_curl.2012.vcxproj", "{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED}"\r
@@ -2996,60 +2990,6 @@ Global
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64 Setup.ActiveCfg = Release|x64\r
                {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x86 Setup.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64 Setup.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64 Setup.ActiveCfg = Release|Win32\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64 Setup.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x86 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|Win32.Build.0 = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64.Build.0 = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x64 Setup.ActiveCfg = Debug|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.ActiveCfg = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|Win32.Build.0 = Release|Win32\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64.Build.0 = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x64 Setup.ActiveCfg = Release|x64\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.Release|x86 Setup.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|Win32.Build.0 = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x64 Setup.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.All|x86 Setup.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|Win32.Build.0 = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64.Build.0 = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x64 Setup.ActiveCfg = Debug|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|Win32.Build.0 = Release|Win32\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64.Build.0 = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x64 Setup.ActiveCfg = Release|x64\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C}.Release|x86 Setup.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.ActiveCfg = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|Win32.Build.0 = Release|Win32\r
                {7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}.All|x64.ActiveCfg = Release|Win32\r
@@ -4074,7 +4014,6 @@ Global
                {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {0B6C905B-142E-4999-B39D-92FF7951E921} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
-               {4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {ABFD88E1-7710-4BCC-AC34-56038DAC9652} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
@@ -4167,7 +4106,6 @@ Global
                {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {E4D29906-8B73-4F8A-B5F4-CA8BFA648F5A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
@@ -4214,7 +4152,6 @@ Global
                {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {D578E676-7EC8-4548-BD8B-845C635F14AD} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {13077E43-E5DF-4EF6-9EB1-2A0B22E8DFAF} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
index 90edbbae22df9ec51e4a11849919517b2cc8145b..97237d7a959e7122ea9ec25a1077a244d9785f36 100755 (executable)
@@ -8,10 +8,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr \
-  libzrtp ilbc iksemel libdingaling libsndfile sofia-sip \
-  speex srtp freetdm spandsp libg722_1 unimrcp tiff-4.0.2 broadvoice silk libcodec2 \
-  fs";
+SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp tiff-4.0.2 fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in
index 6c5766625588f3a17611ae60cacc339083076471..0b67c2a80dd97a8433c24ccecc39d2490bfabde9 100644 (file)
@@ -39,7 +39,6 @@ applications/mod_httapi
 #applications/mod_sonar
 applications/mod_sms
 #applications/mod_snapshot
-#applications/mod_snipe_hunt
 #applications/mod_snom
 #applications/mod_soundtouch
 applications/mod_spandsp
@@ -61,7 +60,6 @@ codecs/mod_amr
 #codecs/mod_amrwb
 codecs/mod_bv
 codecs/mod_b64
-#codecs/mod_celt
 #codecs/mod_codec2
 #codecs/mod_com_g729
 #codecs/mod_dahdi_codec
index fcf7f5fb150331159f9670c3b7a12c04bfd2772b..6480354bffa41d3484e13d6097882c3192ac6f0c 100644 (file)
@@ -27,7 +27,6 @@
 
     <!-- Codec Interfaces -->
     <load module="mod_spandsp"/>
-    <load module="mod_celt"/>
     <load module="mod_opus"/>
     <load module="mod_ilbc"/>
     <load module="mod_h26x"/>
index 311ba4fcc21f01e36a720543671df7aef1264fec..771efd9544dd5a6497264a81f0afeb2834538dae 100644 (file)
@@ -3,7 +3,7 @@
   <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
-  <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G722,PCMU,PCMA,GSM"/>
+  <X-PRE-PROCESS cmd="set" data="codec_prefs=G722,PCMU,PCMA,GSM"/>
   <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
   <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
@@ -86,7 +86,6 @@
        <load module="mod_dptools"/>
        <load module="mod_dialplan_xml"/>
        <load module="mod_voipcodecs"/>
-       <load module="mod_celt"/>
        <load module="mod_sndfile"/>
        <load module="mod_tone_stream"/>
        <load module="mod_local_stream"/>
index b01c56d35187c23a87b2e84ad0f9b45d43fc28d9..e8672357676be6c2f0ce6d31d2fe1f56fc391b49 100644 (file)
@@ -92,7 +92,6 @@
     <load module="mod_b64"/>
     <!--<load module="mod_siren"/>-->
     <!--<load module="mod_isac"/>-->
-    <!--<load module="mod_celt"/>-->
     <load module="mod_opus"/>
 
     <!-- File Format Interfaces -->
index cff3033649d421429ada26dd3d0743022460c970..1458e24954793b0b9a77777fba0bd81ed0e79149 100644 (file)
@@ -550,7 +550,6 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
 AC_SUBST(SYS_XMLRPC_LDFLAGS)
 AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
 
-AC_ARG_ENABLE([system-lua],[AS_HELP_STRING([--enable-system-lua],[use system lib for lua])],,[enable_system_lua="no"])
 PKG_CHECK_MODULES([LUA],[lua5.2],[have_lua=yes],[have_lua=no])
 if test "${have_lua}" = "no" ; then
    PKG_CHECK_MODULES([LUA],[lua5.1],[have_lua=yes],[have_lua=no])
@@ -561,6 +560,8 @@ fi
 if test x"${LUA_LIBS}" = x"" ; then
    LUA_LIBS="-llua"
 fi
+#AC_ARG_ENABLE([system-lua],[AS_HELP_STRING([--enable-system-lua],[use system lib for lua])],,[enable_system_lua="no"])
+enable_system_lua=yes
 AM_CONDITIONAL([SYSTEM_LUA],[test "${enable_system_lua}" = "yes"])
 
 AC_ARG_ENABLE(srtp,
@@ -1247,6 +1248,9 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[
       AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
     fi],[
     AM_CONDITIONAL([HAVE_LDNS],[true])])])
+PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[
+  AM_CONDITIONAL([HAVE_SNDFILE],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])
 
 PKG_CHECK_MODULES([VPX], [vpx >= 1.3.0],[
   AM_CONDITIONAL([HAVE_VPX],[true])],[
@@ -1279,6 +1283,42 @@ PKG_CHECK_MODULES([MAGICK], [ImageMagick >= 6.0.0],[
   AM_CONDITIONAL([HAVE_MAGICK],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MAGICK],[false])])
 
+PKG_CHECK_MODULES([SILK], [silk >= 1.0.8],[
+  AM_CONDITIONAL([HAVE_SILK],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SILK],[false])])
+
+PKG_CHECK_MODULES([BROADVOICE], [broadvoice >= 0.1.0],[
+  AM_CONDITIONAL([HAVE_BROADVOICE],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_BROADVOICE],[false])])
+
+PKG_CHECK_MODULES([ILBC], [ilbc >= 0.0.1],[
+  AM_CONDITIONAL([HAVE_ILBC],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_ILBC],[false])])
+
+PKG_CHECK_MODULES([G7221], [g722_1 >= 0.2.0],[
+  AM_CONDITIONAL([HAVE_G7221],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_G7221],[false])])
+
+PKG_CHECK_MODULES([CODEC2], [codec2 >= 0.2],[
+  AM_CONDITIONAL([HAVE_CODEC2],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_CODEC2],[false])])
+
+PKG_CHECK_MODULES([OPUS], [opus >= 1.1],[
+  AM_CONDITIONAL([HAVE_OPUS],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUS],[false])])
+
+PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.8.0],[
+  AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])])
+
+PKG_CHECK_MODULES([FLITE], [flite >= 2.0.0],[
+  AM_CONDITIONAL([HAVE_FLITE],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_FLITE],[false])])
+
+PKG_CHECK_MODULES([MONGOC], [libmongoc-1.0 >= 1.0.8],[
+  AM_CONDITIONAL([HAVE_MONGOC],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MONGOC],[false])])
+
 PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[
   AM_CONDITIONAL([HAVE_MEMCACHED],[true])
   MEMCACHED_LIBS="${MEMCACHED_LIBS} -lpthread"
@@ -1311,6 +1351,34 @@ AS_IF([test "x$enable_core_libedit_support" != "xno"],[
       AC_MSG_ERROR([You need to either install libedit-dev (>= 2.11) or configure with --disable-core-libedit-support])
       ])])])
 
+dnl ---------------------------------------------------------------------------
+dnl - OpenLDAP SDK
+dnl ---------------------------------------------------------------------------
+
+AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
+dnl Check for other libraries we need to link with to get the main routines.
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
+test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
+
+if test "$with_ldap" = "yes"; then
+   if test "$with_ldap_des" = "yes" ; then
+      OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes"
+   fi
+   if test "$with_ldap_krb" = "yes" ; then
+      OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb"
+   fi
+   if test "$with_ldap_lber" = "yes" ; then
+      OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
+   fi
+   OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
+fi
+
+AM_CONDITIONAL([HAVE_LDAP],[test "x$with_ldap" == "xyes"])
+
+AC_SUBST(OPENLDAP_LIBS)
+
 AS_IF([test "x$enable_core_libedit_support" != "xno"], [
   # If making changes here, don't forget to run autoheader and
   # update libs/esl/src/include/esl_config_auto.h.in manually.
@@ -1588,7 +1656,6 @@ AC_CONFIG_FILES([Makefile
                src/mod/applications/mod_skel/Makefile
                src/mod/applications/mod_sms/Makefile
                src/mod/applications/mod_snapshot/Makefile
-               src/mod/applications/mod_snipe_hunt/Makefile
                src/mod/applications/mod_snom/Makefile
                src/mod/applications/mod_sonar/Makefile
                src/mod/applications/mod_soundtouch/Makefile
@@ -1610,7 +1677,6 @@ AC_CONFIG_FILES([Makefile
                src/mod/codecs/mod_avcodec/Makefile
                src/mod/codecs/mod_b64/Makefile
                src/mod/codecs/mod_bv/Makefile
-               src/mod/codecs/mod_celt/Makefile
                src/mod/codecs/mod_codec2/Makefile
                src/mod/codecs/mod_com_g729/Makefile
                src/mod/codecs/mod_dahdi_codec/Makefile
@@ -1787,19 +1853,13 @@ fi
 if test "$use_system_aprutil" != "yes"; then
    AC_CONFIG_SUBDIRS([libs/apr-util])
 fi
-AC_CONFIG_SUBDIRS([libs/ilbc])
 AC_CONFIG_SUBDIRS([libs/iksemel])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
-AC_CONFIG_SUBDIRS([libs/libsndfile])
 AC_CONFIG_SUBDIRS([libs/sofia-sip])
 AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
 AC_CONFIG_SUBDIRS([libs/tiff-4.0.2])
 AC_CONFIG_SUBDIRS([libs/spandsp])
-AC_CONFIG_SUBDIRS([libs/broadvoice])
-AC_CONFIG_SUBDIRS([libs/libg722_1])
-AC_CONFIG_SUBDIRS([libs/silk])
-AC_CONFIG_SUBDIRS([libs/libcodec2])
 if test "x${enable_zrtp}" = "xyes"; then
    AC_CONFIG_SUBDIRS([libs/libzrtp])
 fi
index 0bbdfc78b32483c351e3c5d3f58418633533d384..1f1c3b0835ba456332d5cca9b06007892c3dfcca 100755 (executable)
@@ -684,7 +684,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-amrwb (= \${binary:Version}),
  freeswitch-mod-b64 (= \${binary:Version}),
  freeswitch-mod-bv (= \${binary:Version}),
- freeswitch-mod-celt (= \${binary:Version}),
  freeswitch-mod-codec2 (= \${binary:Version}),
  freeswitch-mod-dahdi-codec (= \${binary:Version}),
  freeswitch-mod-g723-1 (= \${binary:Version}),
index 7a8a966ef1bee71b2c9722f65e7b520346ef700c..2ccc1a3c9d79a8a3e1df6b52d4c905bcd1009430 100644 (file)
@@ -136,8 +136,7 @@ Build-Depends: libmemcached-dev
 Module: applications/mod_mongo
 Description: MongoDB
  This module provides an interface to MongoDB.
-Build-Depends: scons, libboost-dev, libboost-system-dev,
- libboost-date-time-dev, libboost-thread-dev, libboost-filesystem-dev
+Build-Depends: libmongoc-dev
 
 Module: applications/mod_mp4
 Section: contrib/comm
@@ -183,10 +182,6 @@ Module: applications/mod_rss
 Description: RSS browser
  This module provides an RSS browser.
 
-Module: applications/mod_skel
-Description: Framework demo module
- This module demonstrates how to build an add-on module.
-
 Module: applications/mod_sms
 Description: Astract SMS
  This module provides an abstract facility for interfacing with SMS
@@ -197,10 +192,6 @@ Description: Snapshot
  This module can record a sliding window of audio and take snapshots
  to disk.
 
-Module: applications/mod_snipe_hunt
-Description: Snipe hunt
- This is a framework demo module.
-
 Module: applications/mod_snom
 Description: SNOM specific features
  This module implements features specific to SNOM phones.
@@ -213,6 +204,7 @@ Description: Sonar ping timer
 Module: applications/mod_soundtouch
 Description: Soundtouch
  This module implements example media bugs.
+Build-Depends: libsoundtouch-dev
 
 Module: applications/mod_spandsp
 Description: SpanDSP
@@ -256,6 +248,7 @@ Description: mod_cepstral
 Module: asr_tts/mod_flite
 Description: mod_flite
  Adds mod_flite.
+Build-Depends: libflite-dev
 
 Module: asr_tts/mod_pocketsphinx
 Description: mod_pocketsphinx
@@ -286,14 +279,12 @@ Description: mod_b64
 Module: codecs/mod_bv
 Description: mod_bv
  Adds mod_bv.
-
-Module: codecs/mod_celt
-Description: mod_celt
- Adds mod_celt.
+Build-Depends: libbroadvoice-dev
 
 Module: codecs/mod_codec2
 Description: mod_codec2
  Adds mod_codec2.
+Build-Depends: libcodec2-dev
 
 Module: codecs/mod_com_g729
 Description: mod_com_g729
@@ -319,6 +310,7 @@ Module: codecs/mod_ilbc
 Section: non-free/comm
 Description: mod_ilbc
  Adds mod_ilbc.
+Build-Depends: libilbc-dev
 
 Module: codecs/mod_isac
 Description: mod_isac
@@ -331,6 +323,7 @@ Description: mod_mp4v
 Module: codecs/mod_opus
 Description: mod_opus
  Adds mod_opus.
+Build-Depends: libopus-dev
 
 Module: codecs/mod_sangoma_codec
 Description: mod_sangoma_codec
@@ -340,15 +333,13 @@ Build-Depends: libsngtc-dev
 Module: codecs/mod_silk
 Description: mod_silk
  Adds mod_silk.
+Build-Depends: libsilk-dev
 
 Module: codecs/mod_siren
 Section: non-free/comm
 Description: mod_siren
  Adds mod_siren.
-
-Module: codecs/mod_skel_codec
-Description: mod_skel_codec
- Adds mod_skel_codec.
+Build-Depends: libg7221-dev
 
 Module: codecs/mod_theora
 Description: mod_theora
@@ -377,6 +368,7 @@ Description: mod_dialplan_xml
 Module: directories/mod_ldap
 Description: mod_ldap
  Adds mod_ldap.
+Build-Depends: libldap2-dev
 
 ## mod/endpoints
 
@@ -550,7 +542,7 @@ Build-Depends: libogg-dev, libvorbis-dev
 Module: formats/mod_sndfile
 Description: mod_sndfile
  Adds mod_sndfile.
-Build-Depends: libflac-dev, libogg-dev, libvorbis-dev
+Build-Depends: libsndfile1-dev, libflac-dev, libogg-dev, libvorbis-dev
 
 Module: formats/mod_ssml
 Description: mod_ssml
@@ -728,7 +720,7 @@ Description: mod_xml_curl
 Module: xml_int/mod_xml_ldap
 Description: mod_xml_ldap
  Adds mod_xml_ldap.
-Build-Depends: libsasl2-dev
+Build-Depends: libldap2-dev, libsasl2-dev
 
 Module: xml_int/mod_xml_radius
 Description: mod_xml_radius
index 809466c74ad99b24ff072acefcb8f7eb521dbe95..da36e9c8b848684a8859fc0ef615abefdb1fbdac 100644 (file)
@@ -1363,10 +1363,6 @@ Files: src/mod/applications/mod_stress/FFTReal.h
 Copyright: 1999 Laurent de Soras
 License: unclear
 
-Files: libs/win32/celt/float_cast.h
-Copyright: 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
-License: MPL-1.1
-
 Files: src/mod/loggers/mod_syslog/mod_syslog.c
 Copyright: 2005-2010, James Martelletti <james@nerdc0re.com>
 License: MPL-1.1
index ad5253f2c743159ad71495d4d5f2e6a63a352dd2..c8c33813e561b917212bbc62df97b4366b0c79cb 100755 (executable)
@@ -104,7 +104,6 @@ getlibs () {
   getlib http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz
   getlib http://files.freeswitch.org/downloads/libs/openldap-2.4.19.tar.gz
   getlib http://download.zeromq.org/zeromq-2.1.9.tar.gz \
index c9abfaf6346922caabb4b9c9b65ad7687986dcfa..11024784e4c7a344e5911ea2e3d7296766fc6f77 100644 (file)
@@ -83,7 +83,6 @@ Requires: freeswitch-application-fsv
 Requires: freeswitch-application-http-cache
 Requires: freeswitch-asrtts-flite
 Requires: freeswitch-asrtts-pocketsphinx
-Requires: freeswitch-codec-celt
 Requires: freeswitch-codec-h26x
 Requires: freeswitch-codec-ilbc
 Requires: freeswitch-codec-opus
index b47eb642184822ad38ee0039c284b794d144e3c6..344724f3916a0edaf4a619f62abc08aac7f4c301 100644 (file)
@@ -115,20 +115,18 @@ Vendor:           http://www.freeswitch.org/
 #
 ######################################################################################################################
 Source0:        http://files.freeswitch.org/%{name}-%{version}.tar.bz2
-Source1:       http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz
-Source2:       http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2
-Source3:       http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz
-Source4:       http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
-Source5:       http://files.freeswitch.org/downloads/libs/mpg123-1.13.2.tar.gz
-#Source6:      http://files.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
-Source6:       http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
-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/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
+Source1:       http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2
+Source2:       http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz
+Source3:       http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
+Source4:       http://files.freeswitch.org/downloads/libs/mpg123-1.13.2.tar.gz
+Source5:       http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
+Source6:       http://files.freeswitch.org/downloads/libs/soundtouch-1.7.1.tar.gz
+Source7:       http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
+Source8:       http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
+Source9:       http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
+Source10:       http://files.freeswitch.org/downloads/libs/opus-1.1-p2.tar.gz
+Source11:       http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
+Source12:       http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz
 Prefix:                %{prefix}
 
 
@@ -188,6 +186,7 @@ BuildRequires: bison
 BuildRequires: net-snmp-devel
 BuildRequires: libmemcached-devel
 BuildRequires: portaudio-devel
+BuildRequires: libsndfile-devel
 %if %{build_py26_esl}
 BuildRequires: python26-devel
 Requires: python26
@@ -212,6 +211,7 @@ Requires: libtiff
 Requires: python
 Requires: libtheora
 Requires: libxml2
+Requires: libsndfile
 
 %if %{?suse_version:1}0
 %if 0%{?suse_version} > 910
@@ -671,14 +671,6 @@ Requires:       %{name} = %{version}-%{release}
 %description codec-bv
 BroadVoice16 and BroadVoice32 WideBand Codec support for FreeSWITCH open source telephony platform
 
-%package codec-celt
-Summary:        CELT ultra low delay Codec support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description codec-celt
-CELT ultra low delay Codec support for FreeSWITCH open source telephony platform
-
 %package codec-codec2
 Summary:        Codec2 Narrow Band Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
@@ -1413,7 +1405,7 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm
 #                                              Codecs
 #
 ######################################################################################################################
-CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_celt codecs/mod_codec2 codecs/mod_g723_1 \
+CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \
                codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_mp4v codecs/mod_opus codecs/mod_silk \
                codecs/mod_siren codecs/mod_theora codecs/mod_vp8"
 #
@@ -2064,9 +2056,6 @@ fi
 %files codec-bv
 %{MODINSTDIR}/mod_bv.so*
 
-%files codec-celt
-%{MODINSTDIR}/mod_celt.so*
-
 %files codec-codec2
 %{MODINSTDIR}/mod_codec2.so*
 
index ab8b9ff1b74b15ee31cd03b3c608296438031e43..94c154b007dd3db26506e18a6f9880ab21cfe2b0 100644 (file)
@@ -3,7 +3,7 @@
         <X-PRE-PROCESS cmd="set" data="auto_answer=false"/>
         <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
         <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
-        <X-PRE-PROCESS cmd="set" data="codec_prefs=CELT@48000h,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
+        <X-PRE-PROCESS cmd="set" data="codec_prefs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
         <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>
         <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>
         <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/>
@@ -84,7 +84,6 @@
                                 <load module="mod_spandsp"/>
                                 <load module="mod_ilbc"/>
                                 <load module="mod_speex"/>
-                                <load module="mod_celt"/>
                                 <load module="mod_silk"/>
                                 <load module="mod_siren"/>
                                 <load module="mod_sndfile"/>
diff --git a/libs/win32/Download CELT.2012.vcxproj b/libs/win32/Download CELT.2012.vcxproj
deleted file mode 100644 (file)
index e07e8e4..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}</ProjectGuid>\r
-    <RootNamespace>Download CELT</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <ProjectName>Download CELT</ProjectName>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="$(SolutionDir)\w32\extdll.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CELT\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CELT\$(Configuration)\</IntDir>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="cleancount">\r
-      <FileType>Document</FileType>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading CELT.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\celt-0.10.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz "$(ProjectDir).."\r
-xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\CELT;%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading CELT.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\celt-0.10.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz "$(ProjectDir).."\r
-xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\CELT;%(Outputs)</Outputs>\r
-    </CustomBuild>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r
diff --git a/libs/win32/Download CELT.vcproj b/libs/win32/Download CELT.vcproj
deleted file mode 100644 (file)
index cac1079..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="Download CELT"\r
-       ProjectGUID="{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}"\r
-       RootNamespace="Download CELT"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="10"\r
-                       CharacterSet="2"\r
-                       BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                               CommandLine=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                               CommandLine=""\r
-                               Outputs=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="10"\r
-                       CharacterSet="2"\r
-                       BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                               CommandLine=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine=""\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <File\r
-                       RelativePath=".\CELT\cleancount"\r
-                       >\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCustomBuildTool"\r
-                                       Description="Downloading CELT."\r
-                                       CommandLine="if not exist &quot;$(ProjectDir)..\celt-0.10.0&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)\celt\config.h&quot; &quot;$(ProjectDir)..\celt-0.10.0\libcelt&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(ProjectDir)\celt\float_cast.h&quot; &quot;$(ProjectDir)..\celt-0.10.0\libcelt&quot; /C /D /Y /S /I&#x0D;&#x0A;"\r
-                                       Outputs="$(ProjectDir)..\CELT"\r
-                               />\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCustomBuildTool"\r
-                                       Description="Downloading CELT."\r
-                                       CommandLine="if not exist &quot;$(ProjectDir)..\celt-0.10.0&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)\celt\config.h&quot; &quot;$(ProjectDir)..\celt-0.10.0\libcelt&quot; /C /D /Y /S /I&#x0D;&#x0A;xcopy &quot;$(ProjectDir)\celt\float_cast.h&quot; &quot;$(ProjectDir)..\celt-0.10.0\libcelt&quot; /C /D /Y /S /I&#x0D;&#x0A;"\r
-                                       Outputs="$(ProjectDir)..\CELT"\r
-                               />\r
-                       </FileConfiguration>\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/win32/Download CELT.vcxproj b/libs/win32/Download CELT.vcxproj
deleted file mode 100644 (file)
index e363942..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}</ProjectGuid>\r
-    <RootNamespace>Download CELT</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="$(SolutionDir)\w32\extdll.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CELT\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CELT\$(Configuration)\</IntDir>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="cleancount">\r
-      <FileType>Document</FileType>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading CELT.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\celt-0.10.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz "$(ProjectDir).."\r
-xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\CELT;%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading CELT.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\celt-0.10.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/celt-0.10.0.tar.gz "$(ProjectDir).."\r
-xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\CELT;%(Outputs)</Outputs>\r
-    </CustomBuild>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/win32/celt/libcelt.2012.vcxproj b/libs/win32/celt/libcelt.2012.vcxproj
deleted file mode 100644 (file)
index 1931cb0..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{ABB71A76-42B0-47A4-973A-42E3D920C6FD}</ProjectGuid>\r
-    <RootNamespace>celt</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <ProjectName>libcelt</ProjectName>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DisableSpecificWarnings>4305;4267;4101;4554;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DisableSpecificWarnings>4305;4267;4101;4554;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DisableSpecificWarnings>4305;4267;4101;4554;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DisableSpecificWarnings>4305;4267;4101;4554;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\bands.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\celt.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\cwrs.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entcode.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entdec.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entenc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\header.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\kiss_fft.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\laplace.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mathops.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mdct.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\modes.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\pitch.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\plc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\quant_bands.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangedec.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangeenc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rate.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\vq.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\Download CELT.2012.vcxproj">\r
-      <Project>{fff82f9b-6a2b-4be3-95d8-dc5a4fc71e19}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r
diff --git a/libs/win32/celt/libcelt.2012.vcxproj.filters b/libs/win32/celt/libcelt.2012.vcxproj.filters
deleted file mode 100644 (file)
index 2223656..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\bands.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\celt.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\cwrs.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entcode.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entdec.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entenc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\header.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\kiss_fft.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\laplace.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mdct.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\modes.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\pitch.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\quant_bands.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangedec.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangeenc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rate.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\vq.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mathops.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\plc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/win32/celt/libcelt.vcproj b/libs/win32/celt/libcelt.vcproj
deleted file mode 100644 (file)
index 9a19d9e..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="libcelt"\r
-       ProjectGUID="{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
-       RootNamespace="celt"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="196613"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\celt-0.10.0\libcelt"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\celt-0.10.0\libcelt"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="&quot;..\..\celt-0.10.0\libcelt&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="&quot;..\..\celt-0.10.0\libcelt&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\bands.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\celt.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\cwrs.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\entcode.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\entdec.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\entenc.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\header.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\kiss_fft.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\laplace.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\mathops.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\mdct.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\modes.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\pitch.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\plc.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\quant_bands.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\rangedec.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\rangeenc.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\rate.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\celt-0.10.0\libcelt\vq.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/win32/celt/libcelt.vcxproj b/libs/win32/celt/libcelt.vcxproj
deleted file mode 100644 (file)
index b774320..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{ABB71A76-42B0-47A4-973A-42E3D920C6FD}</ProjectGuid>\r
-    <RootNamespace>celt</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_AMD64_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\bands.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\celt.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\cwrs.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entcode.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entdec.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entenc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\header.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\kiss_fft.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\laplace.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mathops.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mdct.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\modes.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\pitch.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\plc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\quant_bands.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangedec.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangeenc.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rate.c" />\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\vq.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\Download CELT.vcxproj">\r
-      <Project>{fff82f9b-6a2b-4be3-95d8-dc5a4fc71e19}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/win32/celt/libcelt.vcxproj.filters b/libs/win32/celt/libcelt.vcxproj.filters
deleted file mode 100644 (file)
index 2223656..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\bands.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\celt.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\cwrs.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entcode.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entdec.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\entenc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\header.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\kiss_fft.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\laplace.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mdct.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\modes.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\pitch.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\quant_bands.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangedec.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rangeenc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\rate.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\vq.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\mathops.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\celt-0.10.0\libcelt\plc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file
index 34569d5950576c7f8fe53419e91c74ae75527ec7..77e15f3471a79c274992a0b709cad9d2c7d30e4a 100755 (executable)
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-wget -c http://svn.freeswitch.org/downloads/libs/celt-0.6.1.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/lame-3.97.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz
index 2c9245da1b44f0acfd6eb6b0d86818eb309ec5f7..1c55e261aa3ea44e81f855eff6fdc39f16f379e5 100644 (file)
  * 
  *  mod_bv
  *      - BroadVoice16 (8kHz) and BroadVoice32 (16kHz) (https://www.broadcom.com/support/broadvoice)
- *  mod_celt
- *      - Ultra-low delay audio codec (48kHz) (http://celt-codec.org)
  *
  *  mod_codec2
  *      - Codec2 is an open source low bit rate speech at 2400 bit/s and below. (http://www.rowetel.com/blog/?page_id=452)
  *     mod_speex
  *             - libspeex (http://www.speex.org/)
  *
- *     mod_celt
- *             - libcelt (http://www.celt-codec.org/)
- *
  *     mod_siren
  *             - libg722_1 (http://www.polycom.com/company/about_us/technology/siren22/index.html)
  *
index 2249d5613bad1c5b450c69753069c9b631583142..4ab865b7770d7fcdc09cedb9f99c5720a930a3d4 100644 (file)
@@ -3,35 +3,19 @@ include $(top_srcdir)/build/modmake.rulesam
 AUTOMAKE_OPTIONS += foreign
 MODNAME=mod_mongo
 
-MONGOC=mongo-c-driver-1.1.0
-MONGOC_DIR=$(switch_srcdir)/libs/$(MONGOC)
-MONGOC_BUILDDIR=$(switch_builddir)/libs/$(MONGOC)
-MONGOC_LA=$(MONGOC_BUILDDIR)/libmongoc-priv.la
+if HAVE_MONGOC
 
 mod_LTLIBRARIES = mod_mongo.la
 mod_mongo_la_SOURCES  = mod_mongo.c
-mod_mongo_la_CFLAGS   = $(AM_CFLAGS) -I$(MONGOC_DIR)/src/mongoc/ -I$(MONGOC_DIR)/src/libbson/src/bson/
+mod_mongo_la_CFLAGS   = $(AM_CFLAGS) $(MONGOC_CFLAGS)
 mod_mongo_la_CPPFLAGS = $(AM_CPPFLAGS) 
-mod_mongo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(MONGOC_LA)
+mod_mongo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(MONGOC_LIBS)
 mod_mongo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared 
 
-BUILT_SOURCES=$(MONGOC_LA)
-
-$(MONGOC_DIR)/configure:
-       $(GETLIB) $(MONGOC).tar.gz
-       sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/configure
-       sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/build/autotools/SetupLibtool.m4
-       sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/configure
-       sed -i'' -e 's/cruT/cru/' $(MONGOC_DIR)/src/libbson/build/autotools/SetupLibtool.m4
-       cd $(MONGOC_DIR) && autoreconf -i
-       $(TOUCH_TARGET)
-
-$(MONGOC_BUILDDIR)/Makefile: $(MONGOC_DIR)/configure
-       mkdir -p $(MONGOC_BUILDDIR)
-       cd $(MONGOC_BUILDDIR) && $(DEFAULT_VARS) $(MONGOC_DIR)/configure $(DEFAULT_ARGS)
-       $(TOUCH_TARGET)
-
-$(MONGOC_LA): $(MONGOC_BUILDDIR)/Makefile
-       cd $(MONGOC_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
 
+else
+install: error
+all: error
+error:
+       $(error You must install libmongoc-dev to build mod_mongo)
+endif
diff --git a/src/mod/applications/mod_snipe_hunt/Makefile.am b/src/mod/applications/mod_snipe_hunt/Makefile.am
deleted file mode 100644 (file)
index 22bcec0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_snipe_hunt
-
-mod_LTLIBRARIES = mod_snipe_hunt.la
-mod_snipe_hunt_la_SOURCES  = mod_snipe_hunt.c
-mod_snipe_hunt_la_CFLAGS   = $(AM_CFLAGS)
-mod_snipe_hunt_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_snipe_hunt_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.2008.vcproj b/src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.2008.vcproj
deleted file mode 100644 (file)
index 4beaee9..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="mod_skel"\r
-       ProjectGUID="{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"\r
-       RootNamespace="mod_skel"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <File\r
-                       RelativePath=".\mod_skel.c"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.c b/src/mod/applications/mod_snipe_hunt/mod_snipe_hunt.c
deleted file mode 100644 (file)
index 2e4fc29..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Anthony Minessale II <anthm@freeswitch.org>
- * Neal Horman <neal at wanlink dot com>
- *
- *
- * mod_snipe_hunt.c -- Framework Demo Module
- *
- */
-#include <switch.h>
-
-/* Prototypes */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_snipe_hunt_shutdown);
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_snipe_hunt_runtime);
-SWITCH_MODULE_LOAD_FUNCTION(mod_snipe_hunt_load);
-
-/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) 
- * Defines a switch_loadable_module_function_table_t and a static const char[] modname
- */
-SWITCH_MODULE_DEFINITION(mod_snipe_hunt, mod_snipe_hunt_load, mod_snipe_hunt_shutdown, NULL);
-
-typedef enum {
-       CODEC_NEGOTIATION_GREEDY = 1,
-       CODEC_NEGOTIATION_GENEROUS = 2,
-       CODEC_NEGOTIATION_EVIL = 3
-} codec_negotiation_t;
-
-static struct {
-       char *codec_negotiation_str;
-       codec_negotiation_t codec_negotiation;
-       switch_bool_t sip_trace;
-       int integer;
-} globals;
-
-static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed)
-{
-       switch_bool_t value = *(switch_bool_t *) data->ptr;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In siptrace callback: value %s changed %s\n",
-                                         value ? "true" : "false", changed ? "true" : "false");
-
-
-       /*
-          if ((callback_type == CONFIG_LOG || callback_type == CONFIG_RELOAD) && changed) {
-          nua_set_params(((sofia_profile_t*)data->functiondata)->nua, TPTAG_LOG(value), TAG_END());
-          } 
-        */
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" };
-
-/* enforce_min, min, enforce_max, max */
-static switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 };
-static switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = {
-       {"greedy", CODEC_NEGOTIATION_GREEDY},
-       {"generous", CODEC_NEGOTIATION_GENEROUS},
-       {"evil", CODEC_NEGOTIATION_EVIL},
-       {NULL, 0}
-};
-
-static switch_xml_config_item_t instructions[] = {
-       /* parameter name        type                 reloadable   pointer                         default value     options structure */
-       SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy",
-                                          &config_opt_codec_negotiation,
-                                          "greedy|generous|evil", "Specifies the codec negotiation scheme to be used."),
-       SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation, (void *) CODEC_NEGOTIATION_GREEDY,
-                                          &config_opt_codec_negotiation_enum,
-                                          "greedy|generous|evil", "Specifies the codec negotiation scheme to be used."),
-       SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void *) SWITCH_FALSE,
-                                                               (switch_xml_config_callback_t) config_callback_siptrace, NULL,
-                                                               "yes|no", "If enabled, print out sip messages on the console."),
-       SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &globals.integer, (void *) 100, &config_opt_integer,
-                                          NULL, NULL),
-       SWITCH_CONFIG_ITEM_END()
-};
-
-static switch_status_t do_config(switch_bool_t reload)
-{
-       memset(&globals, 0, sizeof(globals));
-
-       if (switch_xml_config_parse_module_settings("snipe_hunt.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open snipe_hunt.conf\n");
-               return SWITCH_STATUS_FALSE;
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(snipe_hunt_function)
-{
-       do_config(SWITCH_TRUE);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/* Macro expands to: switch_status_t mod_snipe_hunt_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
-SWITCH_MODULE_LOAD_FUNCTION(mod_snipe_hunt_load)
-{
-       switch_api_interface_t *api_interface;
-       /* connect my internal structure to the blank pointer passed to me */
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n");
-
-       do_config(SWITCH_FALSE);
-
-       SWITCH_ADD_API(api_interface, "snipe_hunt", "Snipe_Hunt API", snipe_hunt_function, "syntax");
-
-       /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*
-  Called when the system shuts down
-  Macro expands to: switch_status_t mod_snipe_hunt_shutdown() */
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_snipe_hunt_shutdown)
-{
-       /* Cleanup dynamically allocated config settings */
-       switch_xml_config_cleanup(instructions);
-       return SWITCH_STATUS_SUCCESS;
-}
-
-
-/*
-  If it exists, this is called in it's own thread when the module-load completes
-  If it returns anything but SWITCH_STATUS_TERM it will be called again automatically
-  Macro expands to: switch_status_t mod_snipe_hunt_runtime()
-SWITCH_MODULE_RUNTIME_FUNCTION(mod_snipe_hunt_runtime)
-{
-       while(looping)
-       {
-               switch_cond_next();
-       }
-       return SWITCH_STATUS_TERM;
-}
-*/
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet
- */
index 0c2e8270a6a4df3cb6331264f6eeed72b0b8a55d..f2883002b71fea3b8f2c314e2f2cecaa72bcf0a8 100644 (file)
@@ -1,33 +1,18 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_soundtouch
-VERSION=soundtouch-1.7.1
-SNDT_SRC=$(switch_srcdir)/libs/soundtouch
-SNDT_BUILD=$(switch_builddir)/libs/soundtouch
-LA=$(SNDT_BUILD)/source/SoundTouch/libSoundTouch.la
+
+if HAVE_SOUNDTOUCH
 
 mod_LTLIBRARIES = mod_soundtouch.la
 mod_soundtouch_la_SOURCES  = mod_soundtouch.cpp
-mod_soundtouch_la_CFLAGS   = $(AM_CFLAGS) -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include
-mod_soundtouch_la_CXXFLAGS = -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include
-mod_soundtouch_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LA)
+mod_soundtouch_la_CFLAGS   = $(AM_CFLAGS) $(SOUNDTOUCH_CFLAGS) -DINTEGER_SAMPLES 
+mod_soundtouch_la_CXXFLAGS =  $(SOUNDTOUCH_CFLAGS) -DINTEGER_SAMPLES 
+mod_soundtouch_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SOUNDTOUCH_LIBS)
 mod_soundtouch_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(LA)
-
-$(SNDT_SRC):
-       $(GETLIB) $(VERSION).tar.gz
-       sed -i'' -e 's/-fcheck-new//' $(top_srcdir)/libs/soundtouch/source/SoundTouch/Makefile.am
-
-$(SNDT_BUILD)/Makefile: $(SNDT_SRC)
-       mkdir -p $(SNDT_BUILD)/config/m4
-       rm -rf $(SNDT_BUILD)/config/m4/*
-       rm -rf $(SNDT_SRC)/config/m4/*
-       sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(SNDT_SRC)/configure.ac > $(SNDT_SRC)/configure.ac.tmp && \
-               mv $(SNDT_SRC)/configure.ac.tmp $(SNDT_SRC)/configure.ac
-       cd $(SNDT_SRC) && AUTOMAKE="automake --add-missing --foreign --copy" autoreconf -fisv 
-       cd ${SNDT_BUILD} && $(DEFAULT_VARS) $(SNDT_SRC)/configure $(DEFAULT_ARGS) --enable-integer-samples --srcdir=$(SNDT_SRC)
-       ${TOUCH_TARGET}
-
-$(LA): $(SNDT_BUILD)/Makefile 
-       cd $(SNDT_BUILD) && ${MAKE}
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libsoundtouch-dev to build mod_soundtouch)
+endif
index db5235db71b3c51de860f8bd78daee18ee33f465..76493d6424b85aa42935fc2a07852c25747d85ae 100644 (file)
@@ -1,38 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_flite
 
-FLITE=flite-2.0.0
-
-FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-release
-FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)-release
-
-FLITE_LIBDIR=$(FLITE_BUILDDIR)/build/libs
-FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \
-       $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \
-       $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a \
-       $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \
-       $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \
-       $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm
+if HAVE_FLITE
 
 mod_LTLIBRARIES = mod_flite.la
 mod_flite_la_SOURCES  = mod_flite.c
-mod_flite_la_CFLAGS   = $(AM_CFLAGS) -I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include
-mod_flite_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(FLITE_A)
+mod_flite_la_CFLAGS   = $(AM_CFLAGS) $(FLITE_CFLAGS)
+mod_flite_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(FLITE_LIBS)
 mod_flite_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES= $(FLITE_A)
-
-$(FLITE_DIR):
-       $(GETLIB) $(FLITE)-release.tar.bz2
-
-$(FLITE_BUILDDIR)/.stamp-configure: $(FLITE_DIR)
-       mkdir -p $(FLITE_BUILDDIR)
-       cd $(FLITE_BUILDDIR) && $(DEFAULT_VARS) $(FLITE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(FLITE_DIR) --with-audio=none --with-pic --disable-shared
-       test -f Makefile && touch $@
-
-$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/.stamp-configure
-       cd $(FLITE_BUILDDIR) && $(MAKE) -j1
-       test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR)
-       TARGET_OS=`grep TARGET_OS $(FLITE_BUILDDIR)/config/config | sed "s/^.*= //"` ;\
-       TARGET_CPU=`grep TARGET_CPU $(FLITE_BUILDDIR)/config/config | sed "s/^.*= //"` ;\
-       cd $(FLITE_BUILDDIR) && cp build/$$TARGET_CPU-$$TARGET_OS/lib/*.a $(FLITE_LIBDIR)
+else
+install: error
+all: error
+error:
+       $(error You must install libflite-dev to build mod_flite)
+endif
index db4b41590a7963935ed94e65b7d7f10a10cdf20b..cb32a1022fd2e767ea2da9c5df8569e8ddaad241 100644 (file)
@@ -1,17 +1,18 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_bv
 
-BV_DIR=$(switch_srcdir)/libs/broadvoice
-BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
-BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
-BUILT_SOURCES=$(BV_LA)
+if HAVE_BROADVOICE
 
 mod_LTLIBRARIES = mod_bv.la
 mod_bv_la_SOURCES  = mod_bv.c
-mod_bv_la_CFLAGS   = $(AM_CFLAGS) -I$(BV_BUILDDIR)/src -I$(BV_DIR)/src 
-mod_bv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(BV_LA)
+mod_bv_la_CFLAGS   = $(AM_CFLAGS) $(BROADVOICE_CFLAGS)
+mod_bv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(BROADVOICE_LIBS)
 mod_bv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-$(BV_LA): $(BV_DIR)/.update    
-       cd $(BV_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
+
+else
+install: error
+all: error
+error:
+       $(error You must install libbroadvoice-dev to build mod_bv)
+endif
diff --git a/src/mod/codecs/mod_celt/Makefile.am b/src/mod/codecs/mod_celt/Makefile.am
deleted file mode 100644 (file)
index e9611bd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_celt
-
-CELT=celt-0.10.0
-
-CELT_DIR=$(switch_srcdir)/libs/$(CELT)
-CELT_BUILDDIR=$(switch_builddir)/libs/$(CELT)
-CELT_LA=$(CELT_BUILDDIR)/libcelt/.libs/libcelt0.la
-
-mod_LTLIBRARIES      = mod_celt.la
-mod_celt_la_SOURCES  = mod_celt.c
-mod_celt_la_CFLAGS   = $(AM_CFLAGS) -I$(CELT_DIR)/libcelt
-mod_celt_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(CELT_LA)
-mod_celt_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-
-BUILT_SOURCES=$(CELT_LA)
-$(CELT_DIR):
-       $(GETLIB) $(CELT).tar.gz
-
-$(CELT_BUILDDIR)/Makefile: $(CELT_DIR)
-       mkdir -p $(CELT_BUILDDIR)
-       cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR)
-       $(TOUCH_TARGET)
-
-$(CELT_LA): $(CELT_BUILDDIR)/Makefile
-       cd $(CELT_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
-$(MODNAME).lo: $(CELT_LA)
diff --git a/src/mod/codecs/mod_celt/mod_celt.2012.vcxproj b/src/mod/codecs/mod_celt/mod_celt.2012.vcxproj
deleted file mode 100644 (file)
index 911a5da..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{4D418176-3B33-47E6-A63E-01BA34ADD21C}</ProjectGuid>\r
-    <RootNamespace>mod_celt</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <ProjectName>mod_celt</ProjectName>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="mod_celt.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\celt\libcelt.2012.vcxproj">\r
-      <Project>{abb71a76-42b0-47a4-973a-42e3d920c6fd}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">\r
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r
diff --git a/src/mod/codecs/mod_celt/mod_celt.c b/src/mod/codecs/mod_celt/mod_celt.c
deleted file mode 100644 (file)
index 6ca3d4a..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 
- * Brian K. West <brian@freeswitch.org>
- *
- * mod_celt.c -- The CELT ultra-low delay audio codec (http://www.celt-codec.org/)
- *
- */
-
-#include "switch.h"
-#include "celt.h"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_celt_load);
-SWITCH_MODULE_DEFINITION(mod_celt, mod_celt_load, NULL, NULL);
-
-struct celt_context {
-       CELTEncoder *encoder_object;
-       CELTDecoder *decoder_object;
-       CELTMode *mode_object;
-       int frame_size;
-       int bytes_per_packet;
-};
-
-static switch_status_t switch_celt_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       struct celt_context *context = NULL;
-       int encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       int decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       context->frame_size = codec->implementation->samples_per_packet;
-       context->mode_object = celt_mode_create(codec->implementation->actual_samples_per_second, context->frame_size, NULL);
-       context->bytes_per_packet = (codec->implementation->bits_per_second * context->frame_size / codec->implementation->actual_samples_per_second + 4) / 8;
-
-       /*
-          if (codec->fmtp_in) {
-          int x, argc;
-          char *argv[10];
-          argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0])));
-          for (x = 0; x < argc; x++) {
-          char *data = argv[x];
-          char *arg;
-          switch_assert(data);
-          while (*data == ' ') {
-          data++;
-          }
-          if ((arg = strchr(data, '='))) {
-          *arg++ = '\0';
-          if (!strcasecmp(data, "bitrate")) {
-          bit_rate = atoi(arg);
-          }
-          }
-          }
-          }
-
-          codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "bitrate=%d", bit_rate);
-        */
-       if (encoding) {
-               context->encoder_object = celt_encoder_create(context->mode_object, 1, NULL);
-       }
-
-       if (decoding) {
-               context->decoder_object = celt_decoder_create(context->mode_object, 1, NULL);
-       }
-
-       codec->private_info = context;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_celt_destroy(switch_codec_t *codec)
-{
-       codec->private_info = NULL;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_celt_encode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *decoded_data,
-                                                                                 uint32_t decoded_data_len,
-                                                                                 uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                 unsigned int *flag)
-{
-       struct celt_context *context = codec->private_info;
-       int bytes = 0;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       bytes = (uint32_t) celt_encode(context->encoder_object, (void *) decoded_data, codec->implementation->samples_per_packet,
-                                                                  (unsigned char *) encoded_data, context->bytes_per_packet);
-
-       if (bytes > 0) {
-               *encoded_data_len = (uint32_t) bytes;
-               return SWITCH_STATUS_SUCCESS;
-       }
-
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Encoder Error!\n");
-       return SWITCH_STATUS_GENERR;
-}
-
-static switch_status_t switch_celt_decode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *encoded_data,
-                                                                                 uint32_t encoded_data_len,
-                                                                                 uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                 unsigned int *flag)
-{
-       struct celt_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (celt_decode(context->decoder_object, encoded_data, encoded_data_len, decoded_data, codec->implementation->samples_per_packet)) {
-               return SWITCH_STATUS_GENERR;
-       }
-
-       *decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_celt_load)
-{
-       switch_codec_interface_t *codec_interface;
-       int bytes_per_frame;
-       int samples_per_frame;
-       int ms_per_frame;
-       int x;
-
-       /* connect my internal structure to the blank pointer passed to me */
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-       SWITCH_ADD_CODEC(codec_interface, "CELT ultra-low delay");
-
-       ms_per_frame = 2000;
-       samples_per_frame = 96;
-       bytes_per_frame = 192;
-
-       for (x = 0; x < 5; x++) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        114,   /* the IANA code number */
-                                                                                        "CELT",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        48000, /* samples transferred per second */
-                                                                                        48000, /* actual samples transferred per second */
-                                                                                        48000, /* bits transferred per second */
-                                                                                        ms_per_frame,  /* number of microseconds per frame */
-                                                                                        samples_per_frame,     /* number of samples per frame */
-                                                                                        bytes_per_frame,       /* number of bytes per frame decompressed */
-                                                                                        0,     /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        1,     /* number of frames per network packet */
-                                                                                        switch_celt_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_celt_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_celt_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_celt_destroy);  /* deinitalize a codec handle using this implementation */
-               ms_per_frame += 2000;
-               samples_per_frame += 96;
-               bytes_per_frame += 192;
-       }
-
-
-       /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_celt/mod_celt.vcproj b/src/mod/codecs/mod_celt/mod_celt.vcproj
deleted file mode 100644 (file)
index 080f95e..0000000
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="mod_celt"\r
-       ProjectGUID="{4D418176-3B33-47E6-A63E-01BA34ADD21C}"\r
-       RootNamespace="mod_celt"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\..\libs\celt-0.10.0\libcelt"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)Debug/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\..\libs\celt-0.10.0\libcelt"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\..\libs\celt-0.10.0\libcelt"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)Release/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\..\libs\celt-0.10.0\libcelt"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <File\r
-                       RelativePath="mod_celt.c"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/src/mod/codecs/mod_celt/mod_celt.vcxproj b/src/mod/codecs/mod_celt/mod_celt.vcxproj
deleted file mode 100644 (file)
index d1f0705..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{4D418176-3B33-47E6-A63E-01BA34ADD21C}</ProjectGuid>\r
-    <RootNamespace>mod_celt</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\celt-0.10.0\libcelt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="mod_celt.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\celt\libcelt.vcxproj">\r
-      <Project>{abb71a76-42b0-47a4-973a-42e3d920c6fd}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">\r
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file
index 878157e9a8c82dd3bc07b87a26f8aed9da8289b2..dab6ba060285db9287583e7d1b2db03c6a6ef71b 100644 (file)
@@ -1,19 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_codec2
 
-CODEC2_DIR=$(switch_srcdir)/libs/libcodec2
-CODEC2_BUILDDIR=$(switch_builddir)/libs/libcodec2
-CODEC2LA=$(CODEC2_BUILDDIR)/src/libcodec2.la
+if HAVE_CODEC2
 
 mod_LTLIBRARIES = mod_codec2.la
 mod_codec2_la_SOURCES  = mod_codec2.c
-mod_codec2_la_CFLAGS   = $(AM_CFLAGS) -I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src -I$(CODEC2_DIR)/src
-mod_codec2_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(CODEC2LA)
+mod_codec2_la_CFLAGS   = $(AM_CFLAGS) $(CODEC2_CFLAGS)
+mod_codec2_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(CODEC2_LIBS)
 mod_codec2_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(CODEC2LA)
-
-$(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update
-       cd $(CODEC2_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
+else
+install: error
+all: error
+error:
+       $(error You must install libcodec2-dev to build mod_codec2)
+endif
index b2ddde3f909279326e169f7f9956827b45704c69..3078564400181987f72eeae80ce27d371e161897 100644 (file)
@@ -1,18 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_ilbc
 
-ILBC_DIR=$(switch_srcdir)/libs/ilbc
-ILBC_BUILDDIR=$(switch_builddir)/libs/ilbc
-ILBCLA=$(ILBC_BUILDDIR)/src/libilbc.la
+if HAVE_ILBC
 
 mod_LTLIBRARIES = mod_ilbc.la
 mod_ilbc_la_SOURCES  = mod_ilbc.c
-mod_ilbc_la_CFLAGS   = $(AM_CFLAGS) -I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src
-mod_ilbc_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ILBCLA)
+mod_ilbc_la_CFLAGS   = $(AM_CFLAGS) $(ILBC_CFLAGS)
+mod_ilbc_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ILBC_LIBS)
 mod_ilbc_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(ILBCLA)
-
-$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update
-       cd $(ILBC_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libilbc-dev to build mod_ilbc)
+endif
index 0dadfc05ab003845f0a5046f9398f4c80da0c0c1..690c5fa47121abf84e5ba7155d9d95e2b99b2411 100644 (file)
@@ -1,30 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_opus
-OPUS=opus-1.1-p2
-OPUS_DIR=$(switch_srcdir)/libs/$(OPUS)
-OPUS_BUILDDIR=$(switch_builddir)/libs/$(OPUS)
-OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.la
+
+if HAVE_OPUS
 
 mod_LTLIBRARIES = mod_opus.la
 mod_opus_la_SOURCES  = mod_opus.c
-mod_opus_la_CFLAGS   = $(AM_CFLAGS) -I$(OPUS_DIR)/include
-mod_opus_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPUS_LA)
+mod_opus_la_CFLAGS   = $(AM_CFLAGS) $(OPUS_CFLAGS)
+mod_opus_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPUS_LIBS)
 mod_opus_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
 
-MY_DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic --srcdir=$(OPUS_DIR)
-
-BUILT_SOURCES=$(OPUS_LA)
-$(OPUS_DIR)/configure:
-       $(GETLIB) $(OPUS).tar.gz
-
-$(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure
-       mkdir -p $(OPUS_BUILDDIR)
-       cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS)
-       $(TOUCH_TARGET)
-
-$(OPUS_LA): $(OPUS_BUILDDIR)/Makefile
-       cd $(OPUS_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
-$(MODNAME).lo: $(OPUS_LA)
-
+else
+install: error
+all: error
+error:
+       $(error You must install libopus-dev to build mod_opus)
+endif
index 47c5f5616fd9040763f99aa0d883777cfe09f582..e19a9b6c3c9a522a2743a1657fe9f6fc7d67c3c8 100644 (file)
@@ -1,19 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_silk
 
-SILK_DIR=$(switch_srcdir)/libs/silk
-SILK_BUILDDIR=$(switch_builddir)/libs/silk
-SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la
+if HAVE_SILK
 
 mod_LTLIBRARIES = mod_silk.la
 mod_silk_la_SOURCES  = mod_silk.c
-mod_silk_la_CFLAGS   = $(AM_CFLAGS) -I$(SILK_DIR)/src  -I$(SILK_DIR)/interface
-mod_silk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SILK_LA)
+mod_silk_la_CFLAGS   = $(AM_CFLAGS) $(SILK_CFLAGS)
+mod_silk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SILK_LIBS)
 mod_silk_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(SILK_LA)
-
-$(SILK_LA): $(SILK_DIR)/.update        
-       mkdir -p $(SILK_BUILDDIR)
-       cd $(SILK_BUILDDIR) && $(DEFAULT_VARS) $(SILK_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SILK_DIR) --disable-shared && $(MAKE) clean && $(MAKE)
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libsilk-dev to build mod_silk)
+endif
index bc3fd2d4b6d85785c57fca2328a38b5f4890c63c..122563c9b30615ac4965f53471518f47a773b40c 100644 (file)
@@ -1,16 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_siren
-G722_1_DIR=$(switch_srcdir)/libs/libg722_1
-G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1
-G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la
+
+if HAVE_G7221
+
 mod_LTLIBRARIES = mod_siren.la
 mod_siren_la_SOURCES  = mod_siren.c
-mod_siren_la_CFLAGS   = $(AM_CFLAGS) -I$(G722_1_DIR)/src  -I$(G722_1_BUILDDIR)/src
-mod_siren_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(G722_1_LA)
+mod_siren_la_CFLAGS   = $(AM_CFLAGS) $(G7221_CFLAGS)
+mod_siren_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(G7221_LIBS)
 mod_siren_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(G722_1_LA)
-
-$(G722_1_LA): $(G722_1_DIR)/.update    
-       cd $(G722_1_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libg7221-dev to build mod_siren)
+endif
index b5a4586239c41be5f8819d9e8712649fc3572bdd..e5fe3c7cc7b06d49188a473e2af847f02e0d695b 100644 (file)
@@ -1,30 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_ldap
-MAKEFLAGS=-j1
-LDAP=openldap-2.4.19
-LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
-LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
-LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
+
+if HAVE_LDAP
 
 mod_LTLIBRARIES = mod_ldap.la
 mod_ldap_la_SOURCES  = mod_ldap.c
-mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
-mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
+mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED
+mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPENLDAP_LIBS)
 mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-slapd --disable-bdb --disable-hdb
-
-$(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
-
-$(LDAP_DIR):
-       $(GETLIB) $(LDAP).tar.gz
-
-$(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
-       mkdir -p $(LDAP_BUILDDIR)
-       cd $(LDAP_BUILDDIR) && $(MY_DEFAULT_VARS) $(LDAP_DIR)/configure $(MY_DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
-       $(TOUCH_TARGET)
-
-$(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile
-       cd $(LDAP_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libldap2-dev or similar package to build mod_ldap)
+endif
index a633525b72315181e6c0353fd66a3a054a9a1162..e94b9cb100714206c3fd3c6096414956d8cf4421 100644 (file)
@@ -1,18 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_sndfile
 
-SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
-SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
-SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
+if HAVE_SNDFILE
 
 mod_LTLIBRARIES = mod_sndfile.la
 mod_sndfile_la_SOURCES  = mod_sndfile.c
-mod_sndfile_la_CFLAGS   = $(AM_CFLAGS) -I$(SNDFILE_DIR)/src -I$(SNDFILE_BUILDDIR)/src
-mod_sndfile_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SNDFILELA)
+mod_sndfile_la_CFLAGS   = $(AM_CFLAGS) $(SNDFILE_CFLAGS)
+mod_sndfile_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SNDFILE_LIBS)
 mod_sndfile_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(SNDFILELA)
-
-$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
-       cd $(SNDFILE_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
+else
+install: error
+all: error
+error:
+       $(error You must install libsndfile-dev to build mod_sndfile)
+endif
index 650587a192d479de887f3cd8ecb1c793a3d4696d..a169b3dd4073206d9f7136096df3f35559e9c4ef 100644 (file)
@@ -1,33 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_xml_ldap
 
-LDAP=openldap-2.4.19
-LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
-LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
-
-LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
-LIBLUTILA=$(LDAP_BUILDDIR)/libraries/liblutil/liblutil.a
+if HAVE_LDAP
 
 mod_LTLIBRARIES = mod_xml_ldap.la
 mod_xml_ldap_la_SOURCES  = mod_xml_ldap.c
-mod_xml_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
-mod_xml_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
+mod_xml_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED
+mod_xml_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPENLDAP_LIBS)
 mod_xml_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BUILT_SOURCES=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
-
-MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
-
-$(LDAP_DIR):
-       $(GETLIB) $(LDAP).tar.gz
-
-$(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
-       mkdir -p $(LDAP_BUILDDIR)
-       cd $(LDAP_BUILDDIR) && $(MY_DEFAULT_VARS) $(LDAP_DIR)/configure $(MY_DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
-       $(TOUCH_TARGET)
-
-$(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile
-       cd $(LDAP_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
+else
+install: error
+all: error
+error:
+       $(error You must install libldap2-dev or similar package to build mod_xml_ldap)
+endif
index deef4a8c24d07a2630decda37235c33b16ba22eb..59b4ce719b800e3ffe6a7fb288331916404bcc92 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <ProductVersion>3.5</ProductVersion>\r
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
       <RefTargetDir>MODLOCATION</RefTargetDir>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\src\mod\codecs\mod_celt\mod_celt.vcxproj">\r
-      <Name>mod_celt</Name>\r
-      <Project>{4d418176-3b33-47e6-a63e-01ba34add21c}</Project>\r
-      <Private>True</Private>\r
-      <DoNotHarvest>\r
-      </DoNotHarvest>\r
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
-      <RefTargetDir>MODLOCATION</RefTargetDir>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\src\mod\codecs\mod_g723_1\mod_g723_1.2010.vcxproj">\r
       <Name>mod_g723_1</Name>\r
       <Project>{fea1eef7-876f-48de-88bf-c0e3e606d758}</Project>\r
        <Target Name="AfterBuild">\r
        </Target>\r
        -->\r
-</Project>
\ No newline at end of file
+</Project>\r
index 8f82782151ec3315a8ab40e7b0d097f37d67ee17..56c28874eb3760b0e0f9c03864940c23d55570a8 100644 (file)
@@ -114,7 +114,6 @@ Source: {#FreeSWITCH_64bit}\mod\mod_sofia.dll; DestDir: {app}\mod; Flags: 64bit
 Source: {#FreeSWITCH_64bit}\mod\mod_speex.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 Source: {#FreeSWITCH_64bit}\mod\mod_tone_stream.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 Source: {#FreeSWITCH_64bit}\mod\mod_voipcodecs.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
-Source: {#FreeSWITCH_64bit}\mod\mod_celt.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 \r
 ; required FreeSWICTCH dlls for 64bit build\r
 Source: {#FreeSWITCH_64bit}\pthreadVC2.dll; DestDir: {app}; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r