From e08406d1c40782325c96eccb3c3afb7b360c935f Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Fri, 27 Jul 2018 18:56:46 +0300 Subject: [PATCH] FS-11288: [Build-System] Refactor WIX project to not miss modules in msi on slow machines. Move Windows build logic from legacy util.vbs to modern props. Fix sound packages improper extraction. Fix multiprocessor build under msbuild. --- Freeswitch.2017.sln | 448 ---------------- libs/spandsp/src/libtiff.2017.vcxproj | 6 +- libs/win32/Download 16khz Sounds.2017.vcxproj | 78 --- libs/win32/Download 16khz music.2017.vcxproj | 84 --- libs/win32/Download 32khz Sounds.2017.vcxproj | 77 --- libs/win32/Download 32khz music.2017.vcxproj | 84 --- libs/win32/Download 8khz Sounds.2017.vcxproj | 78 --- libs/win32/Download 8khz music.2017.vcxproj | 82 --- libs/win32/Download CELT.2017.vcxproj | 88 ---- libs/win32/Download LAME.2017.vcxproj | 84 --- libs/win32/Download LDNS.2017.vcxproj | 84 --- libs/win32/Download LIBSHOUT.2017.vcxproj | 84 --- libs/win32/Download OGG.2017.vcxproj | 84 --- libs/win32/Download OPUS.2017.vcxproj | 80 --- libs/win32/Download PORTAUDIO.2017.vcxproj | 84 --- libs/win32/Download PTHREAD.2017.vcxproj | 80 --- libs/win32/Download SPEEX.2017.vcxproj | 85 --- libs/win32/Download SQLITE.2017.vcxproj | 85 --- libs/win32/Download broadvoice.2017.vcxproj | 82 --- libs/win32/Download freetype.2017.vcxproj | 82 --- libs/win32/Download g722_1.2017.vcxproj | 82 --- libs/win32/Download iLBC.2017.vcxproj | 82 --- libs/win32/Download libav.2017.vcxproj | 82 --- libs/win32/Download libcodec2.2017.vcxproj | 82 --- libs/win32/Download libjpeg.2017.vcxproj | 84 --- libs/win32/Download libpng.2017.vcxproj | 82 --- libs/win32/Download libsilk.2017.vcxproj | 82 --- libs/win32/Download libx264.2017.vcxproj | 84 --- libs/win32/Download mpg123.2017.vcxproj | 86 --- libs/win32/Download pocketsphinx.2017.vcxproj | 80 --- libs/win32/Download sphinxbase.2017.vcxproj | 80 --- libs/win32/Download sphinxmodel.2017.vcxproj | 83 --- libs/win32/Download tiff.2017.vcxproj | 82 --- libs/win32/Sound_Files/16khz.2017.vcxproj | 111 +--- .../win32/Sound_Files/16khzmusic.2017.vcxproj | 71 +-- libs/win32/Sound_Files/32khz.2017.vcxproj | 111 +--- .../win32/Sound_Files/32khzmusic.2017.vcxproj | 67 +-- libs/win32/Sound_Files/8khz.2017.vcxproj | 111 +--- libs/win32/Sound_Files/8khzmusic.2017.vcxproj | 71 +-- .../broadvoice/libbroadvoice.2017.vcxproj | 5 - libs/win32/celt/libcelt.2017.vcxproj | 12 +- libs/win32/freetype/freetype.2017.vcxproj | 6 +- libs/win32/ilbc/libilbc.2017.vcxproj | 6 +- .../win32/ldns/ldns-lib/ldns-lib.2017.vcxproj | 6 +- libs/win32/libav/libav.2017.vcxproj | 11 +- libs/win32/libcodec2/libcodec2.2017.vcxproj | 6 +- libs/win32/libg722_1/libg722_1.2017.vcxproj | 6 +- libs/win32/libjpeg/libjpeg.2017.vcxproj | 1 + libs/win32/libmp3lame/libmp3lame.2017.vcxproj | 7 +- libs/win32/libogg/libogg.2017.vcxproj | 7 +- libs/win32/libpng/libpng.2017.vcxproj | 6 +- libs/win32/libshout/libshout.2017.vcxproj | 5 +- libs/win32/libsilk/Silk_FIX.2017.vcxproj | 6 +- libs/win32/libvpx/libvpx.2017.vcxproj | 7 +- libs/win32/libx264/libx264.2017.vcxproj | 7 +- ...j.filters => libx264.2017.vcxproj.filters} | 4 +- libs/win32/mpg123/libmpg123.2017.vcxproj | 6 +- libs/win32/opus/opus.2017.vcxproj | 9 +- libs/win32/opus/opus.celt.2017.vcxproj | 6 +- libs/win32/opus/opus.silk_common.2017.vcxproj | 6 +- libs/win32/opus/opus.silk_fixed.2017.vcxproj | 4 +- libs/win32/opus/opus.silk_float.2017.vcxproj | 4 +- .../pocketsphinx/pocketsphinx.2017.vcxproj | 5 +- libs/win32/portaudio/portaudio.2017.vcxproj | 6 +- libs/win32/pthread/pthread.2017.vcxproj | 7 +- .../sofia/libsofia_sip_ua_static.2017.vcxproj | 13 +- libs/win32/speex/libspeex.2017.vcxproj | 6 +- libs/win32/speex/libspeexdsp.2017.vcxproj | 6 +- libs/win32/sphinxbase/sphinxbase.2017.vcxproj | 12 +- libs/win32/sqlite/sqlite.2017.vcxproj | 6 +- libs/win32/util.vbs | 490 ------------------ w32/Library/FreeSwitchCore.2017.vcxproj | 32 +- w32/Setup/Setup.2017.wixproj | 83 ++- w32/broadvoice.props | 1 + w32/download_LAME.props | 40 ++ w32/download_LDNS.props | 40 ++ w32/download_OGG.props | 40 ++ w32/download_broadvoice.props | 40 ++ w32/download_celt.props | 40 ++ w32/download_freetype.props | 40 ++ w32/download_g722_1.props | 40 ++ w32/download_iLBC.props | 40 ++ w32/download_libav.props | 40 ++ w32/download_libcodec2.props | 40 ++ w32/download_libjpeg.props | 40 ++ w32/download_libpng.props | 40 ++ w32/download_libshout.props | 40 ++ w32/download_libsilk.props | 40 ++ w32/download_libx264.props | 40 ++ w32/download_mpg123.props | 46 ++ w32/download_opus.props | 40 ++ w32/download_pocketsphinx.props | 40 ++ w32/download_portaudio.props | 40 ++ w32/download_pthreads.props | 40 ++ w32/download_sounds.props | 29 ++ w32/download_speex.props | 40 ++ w32/download_sphinxbase.props | 40 ++ w32/download_sphinxmodel.props | 40 ++ w32/download_sqlite.props | 40 ++ w32/download_tiff.props | 40 ++ w32/downloadpackage.task | 26 +- w32/gawk.props | 40 ++ w32/sound_tools.props | 107 ++++ w32/switch_version.props | 95 ++++ w32/vsyasm.props | 40 ++ w32/yasm.props | 40 ++ 106 files changed, 1544 insertions(+), 4201 deletions(-) delete mode 100644 libs/win32/Download 16khz Sounds.2017.vcxproj delete mode 100644 libs/win32/Download 16khz music.2017.vcxproj delete mode 100644 libs/win32/Download 32khz Sounds.2017.vcxproj delete mode 100644 libs/win32/Download 32khz music.2017.vcxproj delete mode 100644 libs/win32/Download 8khz Sounds.2017.vcxproj delete mode 100644 libs/win32/Download 8khz music.2017.vcxproj delete mode 100644 libs/win32/Download CELT.2017.vcxproj delete mode 100644 libs/win32/Download LAME.2017.vcxproj delete mode 100644 libs/win32/Download LDNS.2017.vcxproj delete mode 100644 libs/win32/Download LIBSHOUT.2017.vcxproj delete mode 100644 libs/win32/Download OGG.2017.vcxproj delete mode 100644 libs/win32/Download OPUS.2017.vcxproj delete mode 100644 libs/win32/Download PORTAUDIO.2017.vcxproj delete mode 100644 libs/win32/Download PTHREAD.2017.vcxproj delete mode 100644 libs/win32/Download SPEEX.2017.vcxproj delete mode 100644 libs/win32/Download SQLITE.2017.vcxproj delete mode 100644 libs/win32/Download broadvoice.2017.vcxproj delete mode 100644 libs/win32/Download freetype.2017.vcxproj delete mode 100644 libs/win32/Download g722_1.2017.vcxproj delete mode 100644 libs/win32/Download iLBC.2017.vcxproj delete mode 100644 libs/win32/Download libav.2017.vcxproj delete mode 100644 libs/win32/Download libcodec2.2017.vcxproj delete mode 100644 libs/win32/Download libjpeg.2017.vcxproj delete mode 100644 libs/win32/Download libpng.2017.vcxproj delete mode 100644 libs/win32/Download libsilk.2017.vcxproj delete mode 100644 libs/win32/Download libx264.2017.vcxproj delete mode 100644 libs/win32/Download mpg123.2017.vcxproj delete mode 100644 libs/win32/Download pocketsphinx.2017.vcxproj delete mode 100644 libs/win32/Download sphinxbase.2017.vcxproj delete mode 100644 libs/win32/Download sphinxmodel.2017.vcxproj delete mode 100644 libs/win32/Download tiff.2017.vcxproj rename libs/win32/libx264/{libx264.2015.vcxproj.filters => libx264.2017.vcxproj.filters} (99%) delete mode 100644 libs/win32/util.vbs create mode 100644 w32/download_LAME.props create mode 100644 w32/download_LDNS.props create mode 100644 w32/download_OGG.props create mode 100644 w32/download_broadvoice.props create mode 100644 w32/download_celt.props create mode 100644 w32/download_freetype.props create mode 100644 w32/download_g722_1.props create mode 100644 w32/download_iLBC.props create mode 100644 w32/download_libav.props create mode 100644 w32/download_libcodec2.props create mode 100644 w32/download_libjpeg.props create mode 100644 w32/download_libpng.props create mode 100644 w32/download_libshout.props create mode 100644 w32/download_libsilk.props create mode 100644 w32/download_libx264.props create mode 100644 w32/download_mpg123.props create mode 100644 w32/download_opus.props create mode 100644 w32/download_pocketsphinx.props create mode 100644 w32/download_portaudio.props create mode 100644 w32/download_pthreads.props create mode 100644 w32/download_sounds.props create mode 100644 w32/download_speex.props create mode 100644 w32/download_sphinxbase.props create mode 100644 w32/download_sphinxmodel.props create mode 100644 w32/download_sqlite.props create mode 100644 w32/download_tiff.props create mode 100644 w32/gawk.props create mode 100644 w32/sound_tools.props create mode 100644 w32/switch_version.props create mode 100644 w32/vsyasm.props create mode 100644 w32/yasm.props diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index d3d520bed1..f5c0d2a2c5 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -28,8 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XML Interfaces", "XML Inter EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Config", "_Config", "{57D119DC-484F-420F-B9E9-8589FD9A8DF8}" @@ -49,7 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build Sys Makefile.am = Makefile.am build\modmake.rules.in = build\modmake.rules.in build\modules.conf.in = build\modules.conf.in - libs\win32\util.vbs = libs\win32\util.vbs EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m4", "m4", "{CDE9B06A-3C27-4987-8FAE-DF1006BC705D}" @@ -236,8 +233,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2017.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.2017.vcxproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthread\pthread.2017.vcxproj", "{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.2017.vcxproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" @@ -296,38 +291,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fsv", "src\mod\applicat EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lua", "src\mod\languages\mod_lua\mod_lua.2017.vcxproj", "{7B077E7F-1BE7-4291-AB86-55E527B25CAC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download sphinxbase", "libs\win32\Download sphinxbase.2017.vcxproj", "{4F92B672-DADB-4047-8D6A-4BB3796733FD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download sphinxmodel", "libs\win32\Download sphinxmodel.2017.vcxproj", "{2DEE4895-1134-439C-B688-52203E57D878}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download pocketsphinx", "libs\win32\Download pocketsphinx.2017.vcxproj", "{AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinxbase", "libs\win32\sphinxbase\sphinxbase.2017.vcxproj", "{2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pocketsphinx", "libs\win32\pocketsphinx\pocketsphinx.2017.vcxproj", "{94001A0E-A837-445C-8004-F918F10D0226}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_pocketsphinx", "src\mod\asr_tts\mod_pocketsphinx\mod_pocketsphinx.2017.vcxproj", "{2286DA73-9FC5-45BC-A508-85994C3317AB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khzsound", "libs\win32\Download 8khz Sounds.2017.vcxproj", "{3CE1DC99-8246-4DB1-A709-74F19F08EC67}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khzsound", "libs\win32\Download 16khz Sounds.2017.vcxproj", "{87A1FE3D-F410-4C8E-9591-8C625985BC70}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz", "libs\win32\Sound_Files\8khz.2017.vcxproj", "{7A8D8174-B355-4114-AFC1-04777CB9DE0A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz", "libs\win32\Sound_Files\16khz.2017.vcxproj", "{7EB71250-F002-4ED8-92CA-CA218114537A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khzsound", "libs\win32\Download 32khz Sounds.2017.vcxproj", "{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz", "libs\win32\Sound_Files\32khz.2017.vcxproj", "{464AAB78-5489-4916-BE51-BF8D61822311}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_flite", "src\mod\asr_tts\mod_flite\mod_flite.2017.vcxproj", "{66444AEE-554C-11DD-A9F0-8C5D56D89593}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LAME", "libs\win32\Download LAME.2017.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSHOUT", "libs\win32\Download LIBSHOUT.2017.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OGG", "libs\win32\Download OGG.2017.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp3lame", "libs\win32\libmp3lame\libmp3lame.2017.vcxproj", "{E316772F-5D8F-4F2A-8F71-094C3E859D34}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "libs\win32\libshout\libshout.2017.vcxproj", "{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}" @@ -344,12 +321,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_managed", "src\mod\lang EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSWITCH.Managed.2017", "src\mod\languages\mod_managed\managed\FreeSWITCH.Managed.2017.csproj", "{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download mpg123", "libs\win32\Download mpg123.2017.vcxproj", "{E796E337-DE78-4303-8614-9A590862EE95}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpg123", "libs\win32\mpg123\libmpg123.2017.vcxproj", "{419C8F80-D858-4B48-A25C-AF4007608137}" - ProjectSection(ProjectDependencies) = postProject - {E796E337-DE78-4303-8614-9A590862EE95} = {E796E337-DE78-4303-8614-9A590862EE95} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_loopback", "src\mod\endpoints\mod_loopback\mod_loopback.2017.vcxproj", "{B3F424EC-3D8F-417C-B244-3919D5E1A577}" EndProject @@ -392,12 +364,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\s EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2017.vcxproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Download 32khz music.2017.vcxproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2017.vcxproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khz music", "libs\win32\Download 16khz music.2017.vcxproj", "{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz music", "libs\win32\Sound_Files\8khzmusic.2017.vcxproj", "{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz music", "libs\win32\Sound_Files\16khzmusic.2017.vcxproj", "{BA599D0A-4310-4505-91DA-6A6447B3E289}" @@ -437,8 +403,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CELT", "libs\win32\Download CELT.2017.vcxproj", "{FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}" @@ -491,12 +455,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzrtp", "libs\libzrtp\pro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_redis", "src\mod\applications\mod_redis\mod_redis.2017.vcxproj", "{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libjpeg", "libs\win32\Download libjpeg.2017.vcxproj", "{652AD5F7-8488-489F-AAD0-7FBE064703B6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libs\win32\libjpeg\libjpeg.2017.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}" - ProjectSection(ProjectDependencies) = postProject - {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {652AD5F7-8488-489F-AAD0-7FBE064703B6} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abyss", "libs\win32\xmlrpc-c\abyss.2017.vcxproj", "{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9}" ProjectSection(ProjectDependencies) = postProject @@ -531,8 +490,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2017.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "libs\win32\opus\opus.2017.vcxproj", "{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}" @@ -551,14 +508,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.2017.vcxproj", "{1BDAB935-27DC-47E3-95EA-17E024D39C31}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SQLITE", "libs\win32\Download SQLITE.2017.vcxproj", "{97D25665-34CD-4E0C-96E7-88F0795B8883}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LDNS", "libs\win32\Download LDNS.2017.vcxproj", "{5BE9A596-F11F-4379-928C-412F81AE182B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PORTAUDIO", "libs\win32\Download PORTAUDIO.2017.vcxproj", "{C0779BCC-C037-4F58-B890-EF37BA956B3C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtc", "src\mod\endpoints\mod_rtc\mod_rtc.2017.vcxproj", "{3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_verto", "src\mod\endpoints\mod_verto\mod_verto.2017.vcxproj", "{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6}" @@ -568,52 +517,23 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvpx", "libs\win32\libvpx\libvpx.2017.vcxproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\win32\libpng\libpng.2017.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" - ProjectSection(ProjectDependencies) = postProject - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libpng", "libs\win32\Download libpng.2017.vcxproj", "{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype.2017", "libs\win32\freetype\freetype.2017.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" - ProjectSection(ProjectDependencies) = postProject - {0AD87FDA-989F-4638-B6E1-B0132BB0560A} = {0AD87FDA-989F-4638-B6E1-B0132BB0560A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download freetype", "libs\win32\Download freetype.2017.vcxproj", "{0AD87FDA-989F-4638-B6E1-B0132BB0560A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_png", "src\mod\formats\mod_png\mod_png.2017.vcxproj", "{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libav", "libs\win32\Download libav.2017.vcxproj", "{77C9E0A2-177D-4BD6-9EFD-75A56F886325}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libav", "libs\win32\libav\libav.2017.vcxproj", "{841C345F-FCC7-4F64-8F54-0281CEABEB01}" - ProjectSection(ProjectDependencies) = postProject - {77C9E0A2-177D-4BD6-9EFD-75A56F886325} = {77C9E0A2-177D-4BD6-9EFD-75A56F886325} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_av", "src\mod\applications\mod_av\mod_av.2017.vcxproj", "{7AEE504B-23B6-4B05-829E-7CD34855F146}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libx264", "libs\win32\libx264\libx264.2017.vcxproj", "{20179127-853B-4FE9-B7C0-9E817E6A3A72}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libx264", "libs\win32\Download libx264.2017.vcxproj", "{6D1BC01C-3F97-4C08-8A45-69C9B94281AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download tiff", "libs\win32\Download tiff.2017.vcxproj", "{583D8CEA-4171-4493-9025-B63265F408D8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_http_cache", "src\mod\applications\mod_http_cache\mod_http_cache.2017.vcxproj", "{87933C2D-0159-46F7-B326-E1B6E982C21E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download g722_1", "libs\win32\Download g722_1.2017.vcxproj", "{36603FE1-253F-4C2C-AAB6-12927A626135}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download iLBC", "libs\win32\Download iLBC.2017.vcxproj", "{53AADA60-DF12-46FF-BF94-566BBF849336}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download broadvoice", "libs\win32\Download broadvoice.2017.vcxproj", "{46502007-0D94-47AC-A640-C2B5EEA98333}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcodec2", "libs\win32\libcodec2\libcodec2.2017.vcxproj", "{19E934D6-1484-41C8-9305-78DC42FD61F2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_codec2", "src\mod\codecs\mod_codec2\mod_codec2.2017.vcxproj", "{CB4E68A1-8D19-4B5E-87B9-97A895E1BA17}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libcodec2", "libs\win32\Download libcodec2.2017.vcxproj", "{9CFA562C-C611-48A7-90A2-BB031B47FE6D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libsilk", "libs\win32\Download libsilk.2017.vcxproj", "{08782D64-E775-4E96-B707-CC633A226F32}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amqp", "src\mod\event_handlers\mod_amqp\mod_amqp.2017.vcxproj", "{7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr_pg_csv", "src\mod\event_handlers\mod_cdr_pg_csv\mod_cdr_pg_csv.2017.vcxproj", "{411F6D43-9F09-47D0-8B04-E1EB6B67C5BF}" @@ -978,18 +898,6 @@ Global {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|x64 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.Build.0 = Release|x64 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|Win32.ActiveCfg = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|Win32.Build.0 = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64.ActiveCfg = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.All|x64.Build.0 = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64.ActiveCfg = Debug|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64.Build.0 = Debug|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64.ActiveCfg = Release|Win32 - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64.Build.0 = Release|Win32 {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|Win32.ActiveCfg = Release DLL|x64 {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64.ActiveCfg = Release DLL|x64 {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.All|x64.Build.0 = Release DLL|x64 @@ -1305,42 +1213,6 @@ Global {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|Win32.Build.0 = Release|Win32 {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.ActiveCfg = Release|x64 {7B077E7F-1BE7-4291-AB86-55E527B25CAC}.Release|x64.Build.0 = Release|x64 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|Win32.ActiveCfg = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|Win32.Build.0 = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64.ActiveCfg = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.All|x64.Build.0 = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|Win32.Build.0 = Debug|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64.ActiveCfg = Debug|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Debug|x64.Build.0 = Debug|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.ActiveCfg = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|Win32.Build.0 = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64.ActiveCfg = Release|Win32 - {4F92B672-DADB-4047-8D6A-4BB3796733FD}.Release|x64.Build.0 = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.All|Win32.ActiveCfg = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.All|Win32.Build.0 = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.All|x64.ActiveCfg = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.All|x64.Build.0 = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Debug|Win32.ActiveCfg = Debug|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Debug|Win32.Build.0 = Debug|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Debug|x64.ActiveCfg = Debug|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Debug|x64.Build.0 = Debug|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Release|Win32.ActiveCfg = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Release|Win32.Build.0 = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Release|x64.ActiveCfg = Release|Win32 - {2DEE4895-1134-439C-B688-52203E57D878}.Release|x64.Build.0 = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|Win32.ActiveCfg = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|Win32.Build.0 = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64.ActiveCfg = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.All|x64.Build.0 = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|Win32.Build.0 = Debug|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x64.ActiveCfg = Debug|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Debug|x64.Build.0 = Debug|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|Win32.ActiveCfg = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|Win32.Build.0 = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x64.ActiveCfg = Release|Win32 - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E}.Release|x64.Build.0 = Release|Win32 {2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|Win32.ActiveCfg = Debug|x64 {2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64.ActiveCfg = Debug|x64 {2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D}.All|x64.Build.0 = Debug|x64 @@ -1374,25 +1246,6 @@ Global {2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|Win32.Build.0 = Release|Win32 {2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x64.ActiveCfg = Release|x64 {2286DA73-9FC5-45BC-A508-85994C3317AB}.Release|x64.Build.0 = Release|x64 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.Build.0 = Debug|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|Win32.ActiveCfg = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|Win32.Build.0 = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32 - {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.Build.0 = Debug|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Release|x64.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32 @@ -1412,13 +1265,6 @@ Global {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|x64 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|x64 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.Build.0 = Debug|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1438,42 +1284,6 @@ Global {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|Win32.Build.0 = Release|Win32 {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.ActiveCfg = Release|x64 {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.Build.0 = Release|x64 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|Win32.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x64.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Debug|x64.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.Release|x64.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.All|x64.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|Win32.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x64.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Debug|x64.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}.Release|x64.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.All|x64.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|Win32.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x64.ActiveCfg = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Debug|x64.Build.0 = Debug|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|Win32.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|Win32.Build.0 = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x64.ActiveCfg = Release|Win32 - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B}.Release|x64.Build.0 = Release|Win32 {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|Win32.ActiveCfg = Debug|x64 {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.ActiveCfg = Debug|x64 {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.Build.0 = Debug|x64 @@ -1561,18 +1371,6 @@ Global {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.Build.0 = Release|Any CPU {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|x64 {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.Build.0 = Release|x64 - {E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.ActiveCfg = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.All|Win32.Build.0 = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.All|x64.ActiveCfg = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.All|x64.Build.0 = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.ActiveCfg = Debug|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.Build.0 = Debug|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Debug|x64.ActiveCfg = Debug|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Debug|x64.Build.0 = Debug|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.ActiveCfg = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.Build.0 = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Release|x64.ActiveCfg = Release|Win32 - {E796E337-DE78-4303-8614-9A590862EE95}.Release|x64.Build.0 = Release|Win32 {419C8F80-D858-4B48-A25C-AF4007608137}.All|Win32.ActiveCfg = Debug_Generic_Dll|Win32 {419C8F80-D858-4B48-A25C-AF4007608137}.All|Win32.Build.0 = Debug_Generic_Dll|Win32 {419C8F80-D858-4B48-A25C-AF4007608137}.All|x64.ActiveCfg = Debug_Generic_Dll|Win32 @@ -1784,32 +1582,6 @@ Global {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64 - {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.Build.0 = Debug|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32 - {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32 - {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.Build.0 = Debug|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32 - {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32 {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32 {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32 {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32 @@ -2001,17 +1773,6 @@ Global {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32 {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64 {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.ActiveCfg = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|Win32.Build.0 = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.All|x64.ActiveCfg = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.ActiveCfg = Debug|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|Win32.Build.0 = Debug|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.ActiveCfg = Debug|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Debug|x64.Build.0 = Debug|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.ActiveCfg = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|Win32.Build.0 = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.ActiveCfg = Release|Win32 - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19}.Release|x64.Build.0 = Release|Win32 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64 @@ -2280,17 +2041,6 @@ Global {886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.Release|Win32.Build.0 = Release|Win32 {886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.Release|x64.ActiveCfg = Release|x64 {886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.Release|x64.Build.0 = Release|x64 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.All|Win32.ActiveCfg = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.All|Win32.Build.0 = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.All|x64.ActiveCfg = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Debug|Win32.ActiveCfg = Debug|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Debug|Win32.Build.0 = Debug|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Debug|x64.ActiveCfg = Debug|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Debug|x64.Build.0 = Debug|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Release|Win32.ActiveCfg = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Release|Win32.Build.0 = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Release|x64.ActiveCfg = Release|Win32 - {652AD5F7-8488-489F-AAD0-7FBE064703B6}.Release|x64.Build.0 = Release|Win32 {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.All|Win32.ActiveCfg = Release|Win32 {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.All|Win32.Build.0 = Release|Win32 {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.All|x64.ActiveCfg = Release|Win32 @@ -2402,17 +2152,6 @@ Global {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32 {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.ActiveCfg = Debug|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|Win32.Build.0 = Debug|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.ActiveCfg = Debug|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Debug|x64.Build.0 = Debug|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.ActiveCfg = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|Win32.Build.0 = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.ActiveCfg = Release|Win32 - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.Release|x64.Build.0 = Release|Win32 {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.ActiveCfg = Release|Win32 {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|Win32.Build.0 = Release|Win32 {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E}.All|x64.ActiveCfg = Release|x64 @@ -2502,50 +2241,6 @@ Global {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Debug|x64.ActiveCfg = Debug|Any CPU {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Release|Win32.ActiveCfg = Release|Any CPU {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Release|x64.ActiveCfg = Release|Any CPU - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.All|Win32.ActiveCfg = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.All|Win32.Build.0 = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.All|x64.ActiveCfg = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Debug|Win32.ActiveCfg = Debug|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Debug|Win32.Build.0 = Debug|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Debug|x64.ActiveCfg = Debug|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Debug|x64.Build.0 = Debug|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Release|Win32.ActiveCfg = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Release|Win32.Build.0 = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Release|x64.ActiveCfg = Release|Win32 - {1BDAB935-27DC-47E3-95EA-17E024D39C31}.Release|x64.Build.0 = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.All|Win32.ActiveCfg = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.All|Win32.Build.0 = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.All|x64.ActiveCfg = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Debug|Win32.ActiveCfg = Debug|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Debug|Win32.Build.0 = Debug|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Debug|x64.ActiveCfg = Debug|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Debug|x64.Build.0 = Debug|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Release|Win32.ActiveCfg = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Release|Win32.Build.0 = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Release|x64.ActiveCfg = Release|Win32 - {97D25665-34CD-4E0C-96E7-88F0795B8883}.Release|x64.Build.0 = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.All|Win32.ActiveCfg = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.All|Win32.Build.0 = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.All|x64.ActiveCfg = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|Win32.Build.0 = Debug|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x64.ActiveCfg = Debug|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Debug|x64.Build.0 = Debug|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Release|Win32.ActiveCfg = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Release|Win32.Build.0 = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.ActiveCfg = Release|Win32 - {5BE9A596-F11F-4379-928C-412F81AE182B}.Release|x64.Build.0 = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.ActiveCfg = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|Win32.Build.0 = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.All|x64.ActiveCfg = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|Win32.Build.0 = Debug|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.ActiveCfg = Debug|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Debug|x64.Build.0 = Debug|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.ActiveCfg = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|Win32.Build.0 = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.ActiveCfg = Release|Win32 - {C0779BCC-C037-4F58-B890-EF37BA956B3C}.Release|x64.Build.0 = Release|Win32 {3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E}.All|Win32.ActiveCfg = Release|x64 {3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E}.All|x64.ActiveCfg = Release|x64 {3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E}.All|x64.Build.0 = Release|x64 @@ -2604,18 +2299,6 @@ Global {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.ActiveCfg = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.Build.0 = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|x64.ActiveCfg = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|x64.Build.0 = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|Win32.ActiveCfg = Debug|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|Win32.Build.0 = Debug|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|x64.ActiveCfg = Debug|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Debug|x64.Build.0 = Debug|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|Win32.ActiveCfg = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|Win32.Build.0 = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|x64.ActiveCfg = Release|Win32 - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.Release|x64.Build.0 = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.ActiveCfg = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.Build.0 = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|x64.ActiveCfg = Release|x64 @@ -2628,18 +2311,6 @@ Global {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|Win32.ActiveCfg = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|Win32.Build.0 = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|x64.ActiveCfg = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.All|x64.Build.0 = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|Win32.ActiveCfg = Debug|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|Win32.Build.0 = Debug|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|x64.ActiveCfg = Debug|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Debug|x64.Build.0 = Debug|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|Win32.ActiveCfg = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|Win32.Build.0 = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|x64.ActiveCfg = Release|Win32 - {0AD87FDA-989F-4638-B6E1-B0132BB0560A}.Release|x64.Build.0 = Release|Win32 {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|Win32.ActiveCfg = Release|Win32 {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|Win32.Build.0 = Release|Win32 {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.All|x64.ActiveCfg = Release|x64 @@ -2652,14 +2323,6 @@ Global {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|Win32.Build.0 = Release|Win32 {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|x64.ActiveCfg = Release|x64 {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}.Release|x64.Build.0 = Release|x64 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|Win32.ActiveCfg = Release|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|Win32.Build.0 = Release|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|x64.ActiveCfg = Release|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.All|x64.Build.0 = Release|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|Win32.ActiveCfg = Debug|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Debug|x64.ActiveCfg = Debug|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|Win32.ActiveCfg = Release|Win32 - {77C9E0A2-177D-4BD6-9EFD-75A56F886325}.Release|x64.ActiveCfg = Release|Win32 {841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|Win32.ActiveCfg = Release|Win32 {841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|Win32.Build.0 = Release|Win32 {841C345F-FCC7-4F64-8F54-0281CEABEB01}.All|x64.ActiveCfg = Release|x64 @@ -2684,26 +2347,6 @@ Global {20179127-853B-4FE9-B7C0-9E817E6A3A72}.Debug|x64.ActiveCfg = Debug|x64 {20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|Win32.ActiveCfg = Release|Win32 {20179127-853B-4FE9-B7C0-9E817E6A3A72}.Release|x64.ActiveCfg = Release|x64 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|Win32.ActiveCfg = Release|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|Win32.Build.0 = Release|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|x64.ActiveCfg = Release|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.All|x64.Build.0 = Release|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Debug|x64.ActiveCfg = Debug|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|Win32.ActiveCfg = Release|Win32 - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA}.Release|x64.ActiveCfg = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.All|Win32.ActiveCfg = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.All|Win32.Build.0 = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.All|x64.ActiveCfg = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.All|x64.Build.0 = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.ActiveCfg = Debug|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.Build.0 = Debug|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.ActiveCfg = Debug|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.Build.0 = Debug|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.ActiveCfg = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.Build.0 = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.ActiveCfg = Release|Win32 - {583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.Build.0 = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.ActiveCfg = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.Build.0 = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|x64.ActiveCfg = Release|x64 @@ -2716,42 +2359,6 @@ Global {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|Win32.Build.0 = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.ActiveCfg = Release|x64 {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.Build.0 = Release|x64 - {36603FE1-253F-4C2C-AAB6-12927A626135}.All|Win32.ActiveCfg = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.All|Win32.Build.0 = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.All|x64.ActiveCfg = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.All|x64.Build.0 = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Debug|Win32.ActiveCfg = Debug|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Debug|Win32.Build.0 = Debug|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Debug|x64.ActiveCfg = Debug|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Debug|x64.Build.0 = Debug|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Release|Win32.ActiveCfg = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Release|Win32.Build.0 = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Release|x64.ActiveCfg = Release|Win32 - {36603FE1-253F-4C2C-AAB6-12927A626135}.Release|x64.Build.0 = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.All|Win32.ActiveCfg = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.All|Win32.Build.0 = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.All|x64.ActiveCfg = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.All|x64.Build.0 = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Debug|Win32.ActiveCfg = Debug|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Debug|Win32.Build.0 = Debug|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Debug|x64.ActiveCfg = Debug|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Debug|x64.Build.0 = Debug|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Release|Win32.ActiveCfg = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Release|Win32.Build.0 = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Release|x64.ActiveCfg = Release|Win32 - {53AADA60-DF12-46FF-BF94-566BBF849336}.Release|x64.Build.0 = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.All|Win32.ActiveCfg = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.All|Win32.Build.0 = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.All|x64.ActiveCfg = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.All|x64.Build.0 = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Debug|Win32.ActiveCfg = Debug|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Debug|Win32.Build.0 = Debug|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Debug|x64.ActiveCfg = Debug|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Debug|x64.Build.0 = Debug|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Release|Win32.ActiveCfg = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Release|Win32.Build.0 = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Release|x64.ActiveCfg = Release|Win32 - {46502007-0D94-47AC-A640-C2B5EEA98333}.Release|x64.Build.0 = Release|Win32 {19E934D6-1484-41C8-9305-78DC42FD61F2}.All|Win32.ActiveCfg = Release|Win32 {19E934D6-1484-41C8-9305-78DC42FD61F2}.All|Win32.Build.0 = Release|Win32 {19E934D6-1484-41C8-9305-78DC42FD61F2}.All|x64.ActiveCfg = Release|x64 @@ -2776,30 +2383,6 @@ Global {CB4E68A1-8D19-4B5E-87B9-97A895E1BA17}.Release|Win32.Build.0 = Release|Win32 {CB4E68A1-8D19-4B5E-87B9-97A895E1BA17}.Release|x64.ActiveCfg = Release|x64 {CB4E68A1-8D19-4B5E-87B9-97A895E1BA17}.Release|x64.Build.0 = Release|x64 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.All|Win32.ActiveCfg = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.All|Win32.Build.0 = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.All|x64.ActiveCfg = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.All|x64.Build.0 = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Debug|Win32.ActiveCfg = Debug|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Debug|Win32.Build.0 = Debug|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Debug|x64.ActiveCfg = Debug|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Debug|x64.Build.0 = Debug|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Release|Win32.ActiveCfg = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Release|Win32.Build.0 = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Release|x64.ActiveCfg = Release|Win32 - {9CFA562C-C611-48A7-90A2-BB031B47FE6D}.Release|x64.Build.0 = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.All|Win32.ActiveCfg = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.All|Win32.Build.0 = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.All|x64.ActiveCfg = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.All|x64.Build.0 = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Debug|Win32.ActiveCfg = Debug|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Debug|Win32.Build.0 = Debug|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Debug|x64.ActiveCfg = Debug|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Debug|x64.Build.0 = Debug|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Release|Win32.ActiveCfg = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Release|Win32.Build.0 = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Release|x64.ActiveCfg = Release|Win32 - {08782D64-E775-4E96-B707-CC633A226F32}.Release|x64.Build.0 = Release|Win32 {7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3}.All|Win32.ActiveCfg = Release|Win32 {7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3}.All|Win32.Build.0 = Release|Win32 {7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3}.All|x64.ActiveCfg = Release|x64 @@ -3008,7 +2591,6 @@ Global {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} @@ -3038,22 +2620,13 @@ Global {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {E3246D17-E29B-4AB5-962A-C69B0C5837BB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000} - {4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {2DEE4895-1134-439C-B688-52203E57D878} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E} = {C120A020-773F-4EA3-923F-B67AF28B750D} {2F025EAD-99BD-40F5-B2CC-F0A28CAD7F2D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {94001A0E-A837-445C-8004-F918F10D0226} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {2286DA73-9FC5-45BC-A508-85994C3317AB} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} - {3CE1DC99-8246-4DB1-A709-74F19F08EC67} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {87A1FE3D-F410-4C8E-9591-8C625985BC70} = {C120A020-773F-4EA3-923F-B67AF28B750D} {7A8D8174-B355-4114-AFC1-04777CB9DE0A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {7EB71250-F002-4ED8-92CA-CA218114537A} = {4F227C26-768F-46A3-8684-1D08A46FB374} - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F} = {C120A020-773F-4EA3-923F-B67AF28B750D} {464AAB78-5489-4916-BE51-BF8D61822311} = {4F227C26-768F-46A3-8684-1D08A46FB374} {66444AEE-554C-11DD-A9F0-8C5D56D89593} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E316772F-5D8F-4F2A-8F71-094C3E859D34} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D} @@ -3062,7 +2635,6 @@ Global {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000} {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000} - {E796E337-DE78-4303-8614-9A590862EE95} = {C120A020-773F-4EA3-923F-B67AF28B750D} {419C8F80-D858-4B48-A25C-AF4007608137} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {B3F424EC-3D8F-417C-B244-3919D5E1A577} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {14E4A972-9CFB-436D-B0A5-4943F3F80D47} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} @@ -3082,9 +2654,6 @@ Global {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {D1ABE208-6442-4FB4-9AAD-1677E41BC870} = {4F227C26-768F-46A3-8684-1D08A46FB374} {BA599D0A-4310-4505-91DA-6A6447B3E289} = {4F227C26-768F-46A3-8684-1D08A46FB374} {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} = {4F227C26-768F-46A3-8684-1D08A46FB374} @@ -3103,7 +2672,6 @@ Global {746F3632-5BB2-4570-9453-31D6D58A7D8E} = {62F27B1A-C919-4A70-8478-51F178F3B18F} {DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {62F27B1A-C919-4A70-8478-51F178F3B18F} {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} = {C120A020-773F-4EA3-923F-B67AF28B750D} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} @@ -3129,7 +2697,6 @@ Global {74B120FF-6935-4DFE-A142-CDB6BEA99C90} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {652AD5F7-8488-489F-AAD0-7FBE064703B6} = {C120A020-773F-4EA3-923F-B67AF28B750D} {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} {BED7539C-0099-4A14-AD5D-30828F15A171} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411} @@ -3139,7 +2706,6 @@ Global {2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {C120A020-773F-4EA3-923F-B67AF28B750D} {ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} {245603E3-F580-41A5-9632-B25FE3372CBF} = {ED2CA8B5-8E91-4296-A120-02BB0B674652} @@ -3149,33 +2715,19 @@ Global {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0} = {0C808854-54D1-4230-BFF5-77B5FD905000} - {1BDAB935-27DC-47E3-95EA-17E024D39C31} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {97D25665-34CD-4E0C-96E7-88F0795B8883} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {5BE9A596-F11F-4379-928C-412F81AE182B} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {C0779BCC-C037-4F58-B890-EF37BA956B3C} = {C120A020-773F-4EA3-923F-B67AF28B750D} {3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {B6E22500-3DB6-4E6E-8CD5-591B781D7D99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C120A020-773F-4EA3-923F-B67AF28B750D} {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {0AD87FDA-989F-4638-B6E1-B0132BB0560A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} - {77C9E0A2-177D-4BD6-9EFD-75A56F886325} = {C120A020-773F-4EA3-923F-B67AF28B750D} {841C345F-FCC7-4F64-8F54-0281CEABEB01} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {7AEE504B-23B6-4B05-829E-7CD34855F146} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {20179127-853B-4FE9-B7C0-9E817E6A3A72} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {583D8CEA-4171-4493-9025-B63265F408D8} = {C120A020-773F-4EA3-923F-B67AF28B750D} {87933C2D-0159-46F7-B326-E1B6E982C21E} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {36603FE1-253F-4C2C-AAB6-12927A626135} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {53AADA60-DF12-46FF-BF94-566BBF849336} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {46502007-0D94-47AC-A640-C2B5EEA98333} = {C120A020-773F-4EA3-923F-B67AF28B750D} {19E934D6-1484-41C8-9305-78DC42FD61F2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CB4E68A1-8D19-4B5E-87B9-97A895E1BA17} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {9CFA562C-C611-48A7-90A2-BB031B47FE6D} = {C120A020-773F-4EA3-923F-B67AF28B750D} - {08782D64-E775-4E96-B707-CC633A226F32} = {C120A020-773F-4EA3-923F-B67AF28B750D} {7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {411F6D43-9F09-47D0-8B04-E1EB6B67C5BF} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {CEEE31E6-8A08-42C7-BEBD-5EC12072C136} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} diff --git a/libs/spandsp/src/libtiff.2017.vcxproj b/libs/spandsp/src/libtiff.2017.vcxproj index 21a67fbed2..309ada1b7d 100644 --- a/libs/spandsp/src/libtiff.2017.vcxproj +++ b/libs/spandsp/src/libtiff.2017.vcxproj @@ -68,6 +68,7 @@ + @@ -200,11 +201,6 @@ if not exist "$(TiffDir)/tif_config.h" copy "$(TiffDir)\tif_config.vc.h" "$(Tiff - - - {583d8cea-4171-4493-9025-b63265f408d8} - - diff --git a/libs/win32/Download 16khz Sounds.2017.vcxproj b/libs/win32/Download 16khz Sounds.2017.vcxproj deleted file mode 100644 index a33c0caa91..0000000000 --- a/libs/win32/Download 16khz Sounds.2017.vcxproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 16khzsound - {87A1FE3D-F410-4C8E-9591-8C625985BC70} - Download 16khzsound - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\16khzsounds\$(Configuration)\ - $(PlatformName)\16khzsounds\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 16khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 16000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\16000;%(Outputs) - Downloading 16khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 16000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\16000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download 16khz music.2017.vcxproj b/libs/win32/Download 16khz music.2017.vcxproj deleted file mode 100644 index 259b8f5877..0000000000 --- a/libs/win32/Download 16khz music.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 16khz music - {E10571C4-E7F4-4608-B5F2-B22E7EB95400} - Download 16khz music - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\16khzmusic\$(Configuration)\ - $(PlatformName)\16khzmusic\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 16khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - - $(ProjectDir)..\sounds\music\16000;%(Outputs) - Downloading 16khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - - $(ProjectDir)..\sounds\music\16000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download 32khz Sounds.2017.vcxproj b/libs/win32/Download 32khz Sounds.2017.vcxproj deleted file mode 100644 index 8c5ee153f1..0000000000 --- a/libs/win32/Download 32khz Sounds.2017.vcxproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 32khzsound - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F} - Download 32khzsound - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\32khzsounds\$(Configuration)\ - $(PlatformName)\32khzsounds\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 32khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 32000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\32000;%(Outputs) - Downloading 32khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 32000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\32000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download 32khz music.2017.vcxproj b/libs/win32/Download 32khz music.2017.vcxproj deleted file mode 100644 index 40bfc687da..0000000000 --- a/libs/win32/Download 32khz music.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 32khz music - {1F0A8A77-E661-418F-BB92-82172AE43803} - Download 32khz music - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\32khzmusic\$(Configuration)\ - $(PlatformName)\32khzmusic\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 32khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - - $(ProjectDir)..\sounds\music\32000;%(Outputs) - Downloading 32khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - - $(ProjectDir)..\sounds\music\32000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download 8khz Sounds.2017.vcxproj b/libs/win32/Download 8khz Sounds.2017.vcxproj deleted file mode 100644 index 9a178bb5b5..0000000000 --- a/libs/win32/Download 8khz Sounds.2017.vcxproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 8khzsound - {3CE1DC99-8246-4DB1-A709-74F19F08EC67} - Download 8khzsound - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\8khzsounds\$(Configuration)\ - $(PlatformName)\8khzsounds\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 8khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 8000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\8000;%(Outputs) - Downloading 8khzsound. - if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzipSounds en-us-callie 8000 "$(ProjectDir)..\sounds" "$(ProjectDir)..\..\build\sounds_version.txt" - $(ProjectDir)..\sounds\en\us\callie\voicemail\8000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download 8khz music.2017.vcxproj b/libs/win32/Download 8khz music.2017.vcxproj deleted file mode 100644 index d64735a0df..0000000000 --- a/libs/win32/Download 8khz music.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download 8khz music - {4F5C9D55-98EF-4256-8311-32D7BD360406} - Download 8khz music - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\8khzmusic\$(Configuration)\ - $(PlatformName)\8khzmusic\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading 8khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - $(ProjectDir)..\sounds\music\8000;%(Outputs) - Downloading 8khzsound. - set /P SOUND_VERSION=<"$(ProjectDir)..\..\build\moh_version.txt" -if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.tar.gz "$(ProjectDir)..\sounds" - - $(ProjectDir)..\sounds\music\8000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download CELT.2017.vcxproj b/libs/win32/Download CELT.2017.vcxproj deleted file mode 100644 index fcb4a331d4..0000000000 --- a/libs/win32/Download CELT.2017.vcxproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {FFF82F9B-6A2B-4BE3-95D8-DC5A4FC71E19} - Download CELT - Win32Proj - Download CELT - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\CELT\$(Configuration)\ - $(PlatformName)\CELT\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading CELT. - 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).." -xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I -xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I - - $(ProjectDir)..\CELT;%(Outputs) - Downloading CELT. - 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).." -xcopy "$(ProjectDir)\celt\config.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I -xcopy "$(ProjectDir)\celt\float_cast.h" "$(ProjectDir)..\celt-0.10.0\libcelt" /C /D /Y /S /I - - $(ProjectDir)..\CELT;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download LAME.2017.vcxproj b/libs/win32/Download LAME.2017.vcxproj deleted file mode 100644 index 2203eebb94..0000000000 --- a/libs/win32/Download LAME.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download LAME - {D5D2BF72-29FE-4982-A9FA-82AB2086DB1B} - Download LAME - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\LAME\$(Configuration)\ - $(PlatformName)\LAME\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading Lame. - if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4-1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\lame-3.98.4;%(Outputs) - Downloading Lame. - if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4-1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\lame-3.98.4;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download LDNS.2017.vcxproj b/libs/win32/Download LDNS.2017.vcxproj deleted file mode 100644 index cc398216fe..0000000000 --- a/libs/win32/Download LDNS.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download LDNS - {5BE9A596-F11F-4379-928C-412F81AE182B} - Download LDNS - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\LDNS\$(Configuration)\ - $(PlatformName)\LDNS\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading LDNS. - if not exist "$(ProjectDir)..\ldns" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/ldns-1.6.9-1-win.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\ldns;%(Outputs) - Downloading LDNS. - if not exist "$(ProjectDir)..\ldns" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/ldns-1.6.9-1-win.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\ldns;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download LIBSHOUT.2017.vcxproj b/libs/win32/Download LIBSHOUT.2017.vcxproj deleted file mode 100644 index b9d1dfb6fc..0000000000 --- a/libs/win32/Download LIBSHOUT.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download LIBSHOUT - {D5D2BF72-29FE-4982-A9FA-82AB3086DB1B} - Download LIBSHOUT - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\LIBSHOUT\$(Configuration)\ - $(PlatformName)\LIBSHOUT\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading libshout. - if not exist "$(ProjectDir)..\libshout-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\libshout-2.2.2;%(Outputs) - Downloading libshout. - if not exist "$(ProjectDir)..\libshout-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\libshout-2.2.2;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download OGG.2017.vcxproj b/libs/win32/Download OGG.2017.vcxproj deleted file mode 100644 index d90abbefa4..0000000000 --- a/libs/win32/Download OGG.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download OGG - {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} - Download OGG - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\OGG\$(Configuration)\ - $(PlatformName)\OGG\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading OGG. - if not exist "$(ProjectDir)..\libogg-1.1.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\libogg-1.1.3;%(Outputs) - Downloading OGG. - if not exist "$(ProjectDir)..\libogg-1.1.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\libogg-1.1.3;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download OPUS.2017.vcxproj b/libs/win32/Download OPUS.2017.vcxproj deleted file mode 100644 index 56c2db2125..0000000000 --- a/libs/win32/Download OPUS.2017.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download OPUS - {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} - Download OPUS - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\OPUS\$(Configuration)\ - $(PlatformName)\OPUS\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading OPUS. - if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\opus-1.1;%(Outputs) - Downloading OPUS. - if not exist "$(ProjectDir)..\opus-1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/opus-1.1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\opus-1.1;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download PORTAUDIO.2017.vcxproj b/libs/win32/Download PORTAUDIO.2017.vcxproj deleted file mode 100644 index f7d0b90a01..0000000000 --- a/libs/win32/Download PORTAUDIO.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download PORTAUDIO - {C0779BCC-C037-4F58-B890-EF37BA956B3C} - Download PORTAUDIO - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\PORTAUDIO\$(Configuration)\ - $(PlatformName)\PORTAUDIO\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading PORTAUDIO. - if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\portaudio;%(Outputs) - Downloading PORTAUDIO. - if not exist "$(ProjectDir)..\portaudio" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pa_stable_v19_20140130.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\portaudio;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download PTHREAD.2017.vcxproj b/libs/win32/Download PTHREAD.2017.vcxproj deleted file mode 100644 index 208f30c48a..0000000000 --- a/libs/win32/Download PTHREAD.2017.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download PTHREAD - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} - Download PTHREAD - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\PTHREAD\$(Configuration)\ - $(PlatformName)\PTHREAD\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading PTHREAD. - if not exist "$(ProjectDir)..\pthreads-w32-2-9-1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pthreads-w32-2-9-1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\pthreads-w32-2-9-1;%(Outputs) - Downloading PTHREAD. - if not exist "$(ProjectDir)..\pthreads-w32-2-9-1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pthreads-w32-2-9-1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\pthreads-w32-2-9-1;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download SPEEX.2017.vcxproj b/libs/win32/Download SPEEX.2017.vcxproj deleted file mode 100644 index ace2ba4886..0000000000 --- a/libs/win32/Download SPEEX.2017.vcxproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download SPEEX - {1BDAB935-27DC-47E3-95EA-17E024D39C31} - Download SPEEX - Win32Proj - 8.1 - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\SPEEX\$(Configuration)\ - $(PlatformName)\SPEEX\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading SPEEX. - if not exist "$(ProjectDir)..\speex-1.2rc1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/speex-1.2rc1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\speex-1.2rc1;%(Outputs) - Downloading SPEEX. - if not exist "$(ProjectDir)..\speex-1.2rc1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/speex-1.2rc1.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\speex-1.2rc1;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download SQLITE.2017.vcxproj b/libs/win32/Download SQLITE.2017.vcxproj deleted file mode 100644 index 2b1334cf85..0000000000 --- a/libs/win32/Download SQLITE.2017.vcxproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download SQLITE - {97D25665-34CD-4E0C-96E7-88F0795B8883} - Download SQLITE - Win32Proj - 8.1 - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\SQLITE\$(Configuration)\ - $(PlatformName)\SQLITE\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading SQLITE. - if not exist "$(ProjectDir)..\sqlite-amalgamation-3080401" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sqlite-amalgamation-3080401.zip "$(ProjectDir).." - - $(ProjectDir)..\sqlite-amalgamation-3080401;%(Outputs) - Downloading SQLITE. - if not exist "$(ProjectDir)..\sqlite-amalgamation-3080401" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sqlite-amalgamation-3080401.zip "$(ProjectDir).." - - $(ProjectDir)..\sqlite-amalgamation-3080401;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download broadvoice.2017.vcxproj b/libs/win32/Download broadvoice.2017.vcxproj deleted file mode 100644 index e2ca45abb6..0000000000 --- a/libs/win32/Download broadvoice.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download broadvoice - Download broadvoice - Win32Proj - {46502007-0D94-47AC-A640-C2B5EEA98333} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\broadvoice\$(Configuration)\ - $(PlatformName)\broadvoice\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading broadvoice. - if not exist "$(broadvoiceLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/broadvoice-$(broadvoice_Version).tar.gz "$(ProjectDir).." - - $(broadvoiceLibDir);%(Outputs) - Downloading broadvoice. - if not exist "$(broadvoiceLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/broadvoice-$(broadvoice_Version).tar.gz "$(ProjectDir).." - - $(broadvoiceLibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download freetype.2017.vcxproj b/libs/win32/Download freetype.2017.vcxproj deleted file mode 100644 index be38c22566..0000000000 --- a/libs/win32/Download freetype.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download freetype - {0AD87FDA-989F-4638-B6E1-B0132BB0560A} - Download freetype - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\freetype\$(Configuration)\ - $(PlatformName)\freetype\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading freetype. - if not exist "$(ProjectDir)..\freetype" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/freetype.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\freetype;%(Outputs) - Downloading freetype. - if not exist "$(ProjectDir)..\freetype" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/freetype.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\freetype;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download g722_1.2017.vcxproj b/libs/win32/Download g722_1.2017.vcxproj deleted file mode 100644 index 5af4fed270..0000000000 --- a/libs/win32/Download g722_1.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download g722_1 - Download g722_1 - Win32Proj - {36603FE1-253F-4C2C-AAB6-12927A626135} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\g722_1\$(Configuration)\ - $(PlatformName)\g722_1\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading g722_1. - if not exist "$(g722_1LibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/g722_1-$(g722_1_Version).tar.gz "$(ProjectDir).." - - $(g722_1LibDir);%(Outputs) - Downloading g722_1. - if not exist "$(g722_1LibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/g722_1-$(g722_1_Version).tar.gz "$(ProjectDir).." - - $(g722_1LibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download iLBC.2017.vcxproj b/libs/win32/Download iLBC.2017.vcxproj deleted file mode 100644 index 1f169d8972..0000000000 --- a/libs/win32/Download iLBC.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download iLBC - Download iLBC - Win32Proj - {53AADA60-DF12-46FF-BF94-566BBF849336} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\iLBC\$(Configuration)\ - $(PlatformName)\iLBC\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading iLBC. - if not exist "$(iLBCLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/ilbc-$(iLBC_Version).tar.gz "$(ProjectDir).." - - $(iLBCLibDir);%(Outputs) - Downloading iLBC. - if not exist "$(iLBCLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/ilbc-$(iLBC_Version).tar.gz "$(ProjectDir).." - - $(iLBCLibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libav.2017.vcxproj b/libs/win32/Download libav.2017.vcxproj deleted file mode 100644 index e0dcb03339..0000000000 --- a/libs/win32/Download libav.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libav - Download libav - Win32Proj - {77C9E0A2-177D-4BD6-9EFD-75A56F886325} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libav\$(Configuration)\ - $(PlatformName)\libav\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading libav. - if not exist "$(ProjectDir)..\libav" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libav-12.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\libav;%(Outputs) - Downloading libav. - if not exist "$(ProjectDir)..\libav" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libav-12.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\libav;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libcodec2.2017.vcxproj b/libs/win32/Download libcodec2.2017.vcxproj deleted file mode 100644 index 7e85186c7f..0000000000 --- a/libs/win32/Download libcodec2.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libcodec2 - Download libcodec2 - Win32Proj - {9CFA562C-C611-48A7-90A2-BB031B47FE6D} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libcodec2\$(Configuration)\ - $(PlatformName)\libcodec2\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading libcodec2. - if not exist "$(libcodec2LibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libcodec2-$(libcodec2_Version).tar.gz "$(ProjectDir).." - - $(libcodec2LibDir);%(Outputs) - Downloading libcodec2. - if not exist "$(libcodec2LibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libcodec2-$(libcodec2_Version).tar.gz "$(ProjectDir).." - - $(libcodec2LibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libjpeg.2017.vcxproj b/libs/win32/Download libjpeg.2017.vcxproj deleted file mode 100644 index 4aa5113de2..0000000000 --- a/libs/win32/Download libjpeg.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libjpeg - {652AD5F7-8488-489F-AAD0-7FBE064703B6} - Download libjpeg - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\jpeg-8d\$(Configuration)\ - $(PlatformName)\jpeg-8d\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading libjpeg. - if not exist "$(ProjectDir)..\jpeg-8d" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://www.ijg.org/files/jpegsrc.v8d.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\jpeg-8d;%(Outputs) - Downloading libjpeg. - if not exist "$(ProjectDir)..\jpeg-8d" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://www.ijg.org/files/jpegsrc.v8d.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\jpeg-8d;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libpng.2017.vcxproj b/libs/win32/Download libpng.2017.vcxproj deleted file mode 100644 index cabea06a76..0000000000 --- a/libs/win32/Download libpng.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libpng - {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} - Download libpng - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libpng\$(Configuration)\ - $(PlatformName)\libpng\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading libpng. - if not exist "$(ProjectDir)..\libpng" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libpng.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\libpng;%(Outputs) - Downloading libpng. - if not exist "$(ProjectDir)..\libpng" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libpng.tar.bz2 "$(ProjectDir).." - - $(ProjectDir)..\libpng;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libsilk.2017.vcxproj b/libs/win32/Download libsilk.2017.vcxproj deleted file mode 100644 index 544d4b0dbe..0000000000 --- a/libs/win32/Download libsilk.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libsilk - Download libsilk - Win32Proj - {08782D64-E775-4E96-B707-CC633A226F32} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libsilk\$(Configuration)\ - $(PlatformName)\libsilk\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading libsilk. - if not exist "$(libsilkLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libsilk-$(libsilk_Version).tar.gz "$(ProjectDir).." - - $(libsilkLibDir);%(Outputs) - Downloading libsilk. - if not exist "$(libsilkLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libsilk-$(libsilk_Version).tar.gz "$(ProjectDir).." - - $(libsilkLibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download libx264.2017.vcxproj b/libs/win32/Download libx264.2017.vcxproj deleted file mode 100644 index 938bf3cba4..0000000000 --- a/libs/win32/Download libx264.2017.vcxproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download libx264 - Download libx264 - Win32Proj - {6D1BC01C-3F97-4C08-8A45-69C9B94281AA} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libx264\$(Configuration)\ - $(PlatformName)\libx264\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading libx264. - if not exist "$(ProjectDir)..\libx264" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libx264.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\vsyasm.exe" cscript /nologo "$(ProjectDir)util.vbs" GetVSYasmEXE "$(ProjectDir)\..\" - - $(ProjectDir)..\libx264;%(Outputs) - Downloading libx264. - if not exist "$(ProjectDir)..\libx264" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libx264.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\vsyasm.exe" cscript /nologo "$(ProjectDir)util.vbs" GetVSYasmEXE "$(ProjectDir)\..\" - - $(ProjectDir)..\libx264;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download mpg123.2017.vcxproj b/libs/win32/Download mpg123.2017.vcxproj deleted file mode 100644 index 39fccba18b..0000000000 --- a/libs/win32/Download mpg123.2017.vcxproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download mpg123 - {E796E337-DE78-4303-8614-9A590862EE95} - Download mpg123 - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\mpg123\$(Configuration)\ - $(PlatformName)\mpg123\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading mpg123. - if not exist "$(ProjectDir)..\libmpg123" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/mpg123-1.14.4.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\libmpg123" move "$(ProjectDir)..\mpg123-1.14.4" "$(ProjectDir)..\libmpg123" - - $(ProjectDir)..\libmpg123;%(Outputs) - Downloading mpg123. - if not exist "$(ProjectDir)..\libmpg123" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/mpg123-1.14.4.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\libmpg123" move "$(ProjectDir)..\mpg123-1.14.4" "$(ProjectDir)..\libmpg123" - - $(ProjectDir)..\libmpg123;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download pocketsphinx.2017.vcxproj b/libs/win32/Download pocketsphinx.2017.vcxproj deleted file mode 100644 index 7ede947247..0000000000 --- a/libs/win32/Download pocketsphinx.2017.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download pocketsphinx - {AF8163EE-FA76-4904-A11D-7D70A1B5BA2E} - Download pocketsphinx - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\pocketsphinx\$(Configuration)\ - $(PlatformName)\pocketsphinx\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading pocketsphinx. - if not exist "$(ProjectDir)..\pocketsphinx-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\pocketsphinx-0.7;%(Outputs) - Downloading pocketsphinx. - if not exist "$(ProjectDir)..\pocketsphinx-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\pocketsphinx-0.7;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download sphinxbase.2017.vcxproj b/libs/win32/Download sphinxbase.2017.vcxproj deleted file mode 100644 index 74b9856374..0000000000 --- a/libs/win32/Download sphinxbase.2017.vcxproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download sphinxbase - {4F92B672-DADB-4047-8D6A-4BB3796733FD} - Download sphinxbase - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\sphinxbase\$(Configuration)\ - $(PlatformName)\sphinxbase\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading sphinxbase. - if not exist "$(ProjectDir)..\sphinxbase-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\sphinxbase-0.7;%(Outputs) - Downloading sphinxbase. - if not exist "$(ProjectDir)..\sphinxbase-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\sphinxbase-0.7;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download sphinxmodel.2017.vcxproj b/libs/win32/Download sphinxmodel.2017.vcxproj deleted file mode 100644 index 83876e5009..0000000000 --- a/libs/win32/Download sphinxmodel.2017.vcxproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download sphinxmodel - {2DEE4895-1134-439C-B688-52203E57D878} - Download sphinxmodel - Win32Proj - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\sphinxmodel\$(Configuration)\ - $(PlatformName)\sphinxmodel\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading sphinxmodel. - if not exist "$(SolutionDir)\libs\Communicator_semi_40.cd_semi_6000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz "$(ProjectDir).." - - $(ProjectDir)..\Communicator_semi_40.cd_semi_6000;%(Outputs) - Downloading sphinxmodel. - if not exist "$(SolutionDir)\libs\Communicator_semi_40.cd_semi_6000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz "$(ProjectDir).." - $(ProjectDir)..\Communicator_semi_40.cd_semi_6000;%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Download tiff.2017.vcxproj b/libs/win32/Download tiff.2017.vcxproj deleted file mode 100644 index bd590988e5..0000000000 --- a/libs/win32/Download tiff.2017.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download tiff - Download tiff - Win32Proj - {583D8CEA-4171-4493-9025-B63265F408D8} - - - - Utility - MultiByte - v141 - - - Utility - MultiByte - v141 - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\tiff\$(Configuration)\ - $(PlatformName)\tiff\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Downloading tiff. - if not exist "$(TiffLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/tiff-$(TiffVersion).tar.gz "$(ProjectDir).." - - $(TiffLibDir);%(Outputs) - Downloading tiff. - if not exist "$(TiffLibDir)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/tiff-$(TiffVersion).tar.gz "$(ProjectDir).." - - $(TiffLibDir);%(Outputs) - - - - - - \ No newline at end of file diff --git a/libs/win32/Sound_Files/16khz.2017.vcxproj b/libs/win32/Sound_Files/16khz.2017.vcxproj index 345104617a..03d84483d2 100644 --- a/libs/win32/Sound_Files/16khz.2017.vcxproj +++ b/libs/win32/Sound_Files/16khz.2017.vcxproj @@ -22,7 +22,6 @@ 16khz {7EB71250-F002-4ED8-92CA-CA218114537A} My16khz - 8.1 @@ -47,111 +46,19 @@ MultiByte v141 + + en-us-callie + 16000 + en\us\callie\voicemail\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)sounds\en\us\callie\ivr\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)sounds\en\us\callie\conference\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)sounds\en\us\callie\time\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)sounds\en\us\callie\digits\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)sounds\en\us\callie\misc\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)sounds\en\us\callie\currency\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*" "$(OutDir)sounds\en\us\callie\directory\16000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)sounds\en\us\callie\ivr\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)sounds\en\us\callie\conference\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)sounds\en\us\callie\time\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)sounds\en\us\callie\digits\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)sounds\en\us\callie\misc\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)sounds\en\us\callie\currency\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*" "$(OutDir)sounds\en\us\callie\directory\16000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)sounds\en\us\callie\ivr\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)sounds\en\us\callie\conference\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)sounds\en\us\callie\time\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)sounds\en\us\callie\digits\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)sounds\en\us\callie\misc\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)sounds\en\us\callie\currency\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*" "$(OutDir)sounds\en\us\callie\directory\16000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)sounds\en\us\callie\ivr\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)sounds\en\us\callie\conference\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)sounds\en\us\callie\time\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)sounds\en\us\callie\digits\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)sounds\en\us\callie\misc\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)sounds\en\us\callie\currency\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\16000\*.*" "$(OutDir)sounds\en\us\callie\directory\16000" /C /D /Y /S /I - - - - - - {87a1fe3d-f410-4c8e-9591-8c625985bc70} - false - - diff --git a/libs/win32/Sound_Files/16khzmusic.2017.vcxproj b/libs/win32/Sound_Files/16khzmusic.2017.vcxproj index 3309d2611b..7ae9877f00 100644 --- a/libs/win32/Sound_Files/16khzmusic.2017.vcxproj +++ b/libs/win32/Sound_Files/16khzmusic.2017.vcxproj @@ -22,7 +22,6 @@ 16khz music {BA599D0A-4310-4505-91DA-6A6447B3E289} My16khzmusic - 8.1 @@ -47,71 +46,19 @@ MultiByte v141 + + music + 16000 + music\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)sounds\music\16000" /C /D /Y /S /I - - - - - - {e10571c4-e7f4-4608-b5f2-b22e7eb95400} - false - - diff --git a/libs/win32/Sound_Files/32khz.2017.vcxproj b/libs/win32/Sound_Files/32khz.2017.vcxproj index cb96a82c8e..8f32759b6b 100644 --- a/libs/win32/Sound_Files/32khz.2017.vcxproj +++ b/libs/win32/Sound_Files/32khz.2017.vcxproj @@ -22,7 +22,6 @@ 32khz {464AAB78-5489-4916-BE51-BF8D61822311} My32khz - 8.1 @@ -47,111 +46,19 @@ MultiByte v141 + + en-us-callie + 32000 + en\us\callie\voicemail\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)sounds\en\us\callie\ivr\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)sounds\en\us\callie\conference\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)sounds\en\us\callie\time\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)sounds\en\us\callie\digits\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)sounds\en\us\callie\misc\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)sounds\en\us\callie\currency\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*" "$(OutDir)sounds\en\us\callie\directory\32000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)sounds\en\us\callie\ivr\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)sounds\en\us\callie\conference\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)sounds\en\us\callie\time\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)sounds\en\us\callie\digits\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)sounds\en\us\callie\misc\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)sounds\en\us\callie\currency\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*" "$(OutDir)sounds\en\us\callie\directory\32000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)sounds\en\us\callie\ivr\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)sounds\en\us\callie\conference\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)sounds\en\us\callie\time\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)sounds\en\us\callie\digits\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)sounds\en\us\callie\misc\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)sounds\en\us\callie\currency\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*" "$(OutDir)sounds\en\us\callie\directory\32000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)sounds\en\us\callie\ivr\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)sounds\en\us\callie\conference\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)sounds\en\us\callie\time\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)sounds\en\us\callie\digits\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)sounds\en\us\callie\misc\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)sounds\en\us\callie\currency\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\32000\*.*" "$(OutDir)sounds\en\us\callie\directory\32000" /C /D /Y /S /I - - - - - - {6e49f6c2-adda-4bfb-81fe-ab9af51b455f} - false - - diff --git a/libs/win32/Sound_Files/32khzmusic.2017.vcxproj b/libs/win32/Sound_Files/32khzmusic.2017.vcxproj index a25542d716..6ba336d7c1 100644 --- a/libs/win32/Sound_Files/32khzmusic.2017.vcxproj +++ b/libs/win32/Sound_Files/32khzmusic.2017.vcxproj @@ -22,7 +22,6 @@ 32khz music {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} My32khz music - 8.1 @@ -47,67 +46,19 @@ MultiByte v141 + + music + 32000 + music\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I - - - - - xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I - - - - - xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I - - - - - xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)sounds\music\32000" /C /D /Y /S /I - - - - - {1f0a8a77-e661-418f-bb92-82172ae43803} - false - - diff --git a/libs/win32/Sound_Files/8khz.2017.vcxproj b/libs/win32/Sound_Files/8khz.2017.vcxproj index eeb84c9a34..39e395c1c5 100644 --- a/libs/win32/Sound_Files/8khz.2017.vcxproj +++ b/libs/win32/Sound_Files/8khz.2017.vcxproj @@ -22,7 +22,6 @@ 8khz {7A8D8174-B355-4114-AFC1-04777CB9DE0A} Sound_Files - 8.1 @@ -47,111 +46,19 @@ MultiByte v141 + + en-us-callie + 8000 + en\us\callie\voicemail\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)sounds\en\us\callie\ivr\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)sounds\en\us\callie\conference\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)sounds\en\us\callie\time\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)sounds\en\us\callie\digits\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)sounds\en\us\callie\misc\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)sounds\en\us\callie\currency\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*" "$(OutDir)sounds\en\us\callie\directory\8000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)sounds\en\us\callie\ivr\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)sounds\en\us\callie\conference\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)sounds\en\us\callie\time\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)sounds\en\us\callie\digits\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)sounds\en\us\callie\misc\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)sounds\en\us\callie\currency\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*" "$(OutDir)sounds\en\us\callie\directory\8000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)sounds\en\us\callie\ivr\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)sounds\en\us\callie\conference\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)sounds\en\us\callie\time\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)sounds\en\us\callie\digits\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)sounds\en\us\callie\misc\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)sounds\en\us\callie\currency\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*" "$(OutDir)sounds\en\us\callie\directory\8000" /C /D /Y /S /I - - - - - - -xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)sounds\en\us\callie\ivr\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)sounds\en\us\callie\conference\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)sounds\en\us\callie\time\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)sounds\en\us\callie\digits\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)sounds\en\us\callie\misc\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)sounds\en\us\callie\currency\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I -xcopy "$(SolutionDir)libs\sounds\en\us\callie\directory\8000\*.*" "$(OutDir)sounds\en\us\callie\directory\8000" /C /D /Y /S /I - - - - - - {3ce1dc99-8246-4db1-a709-74f19f08ec67} - false - - diff --git a/libs/win32/Sound_Files/8khzmusic.2017.vcxproj b/libs/win32/Sound_Files/8khzmusic.2017.vcxproj index 77a8569299..e142c100d7 100644 --- a/libs/win32/Sound_Files/8khzmusic.2017.vcxproj +++ b/libs/win32/Sound_Files/8khzmusic.2017.vcxproj @@ -22,7 +22,6 @@ 8khz music {D1ABE208-6442-4FB4-9AAD-1677E41BC870} 8khz music - 8.1 @@ -47,71 +46,19 @@ MultiByte v141 + + music + 8000 + music\$(SoundQuality) + + + $(PlatformName)\$(Configuration)\$(ProjectName)\$(SoundQuality) + + - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - $(PlatformName)\$(Configuration)\$(ProjectName)\ - - - - xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I - - - - - - xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)sounds\music\8000" /C /D /Y /S /I - - - - - - {4f5c9d55-98ef-4256-8311-32d7bd360406} - false - - diff --git a/libs/win32/broadvoice/libbroadvoice.2017.vcxproj b/libs/win32/broadvoice/libbroadvoice.2017.vcxproj index a6da2a5e99..c4aac64476 100644 --- a/libs/win32/broadvoice/libbroadvoice.2017.vcxproj +++ b/libs/win32/broadvoice/libbroadvoice.2017.vcxproj @@ -200,11 +200,6 @@ - - - {46502007-0d94-47ac-a640-c2b5eea98333} - - diff --git a/libs/win32/celt/libcelt.2017.vcxproj b/libs/win32/celt/libcelt.2017.vcxproj index b66efba609..d2eda96973 100644 --- a/libs/win32/celt/libcelt.2017.vcxproj +++ b/libs/win32/celt/libcelt.2017.vcxproj @@ -48,6 +48,7 @@ v141 + @@ -70,6 +71,11 @@ <_ProjectFileVersion>10.0.30319.1 + + + .\;%(AdditionalIncludeDirectories) + + Disabled @@ -145,12 +151,6 @@ - - - {fff82f9b-6a2b-4be3-95d8-dc5a4fc71e19} - false - - diff --git a/libs/win32/freetype/freetype.2017.vcxproj b/libs/win32/freetype/freetype.2017.vcxproj index 629d041817..46c53d7d40 100644 --- a/libs/win32/freetype/freetype.2017.vcxproj +++ b/libs/win32/freetype/freetype.2017.vcxproj @@ -47,6 +47,7 @@ v141 + @@ -631,11 +632,6 @@ - - - {0ad87fda-989f-4638-b6e1-b0132bb0560a} - - diff --git a/libs/win32/ilbc/libilbc.2017.vcxproj b/libs/win32/ilbc/libilbc.2017.vcxproj index e3dec17bb6..dd524f6b63 100644 --- a/libs/win32/ilbc/libilbc.2017.vcxproj +++ b/libs/win32/ilbc/libilbc.2017.vcxproj @@ -49,6 +49,7 @@ + @@ -166,11 +167,6 @@ - - - {53aada60-df12-46ff-bf94-566bbf849336} - - diff --git a/libs/win32/ldns/ldns-lib/ldns-lib.2017.vcxproj b/libs/win32/ldns/ldns-lib/ldns-lib.2017.vcxproj index 92ca65a874..212e89d2ae 100644 --- a/libs/win32/ldns/ldns-lib/ldns-lib.2017.vcxproj +++ b/libs/win32/ldns/ldns-lib/ldns-lib.2017.vcxproj @@ -47,6 +47,7 @@ v141 + @@ -260,11 +261,6 @@ if not exist "$(ProjectDir)..\..\..\ldns\ldns\net.h" type "$(ProjectDir)\net.h" - - - {5be9a596-f11f-4379-928c-412f81ae182b} - - diff --git a/libs/win32/libav/libav.2017.vcxproj b/libs/win32/libav/libav.2017.vcxproj index 7a1381e0c4..6ae6dc006f 100644 --- a/libs/win32/libav/libav.2017.vcxproj +++ b/libs/win32/libav/libav.2017.vcxproj @@ -24,6 +24,8 @@ 8.1 {841C345F-FCC7-4F64-8F54-0281CEABEB01} + + StaticLibrary @@ -141,12 +143,6 @@ <_ProjectFileVersion>10.0.30319.1 - - Document - Downloading Yasm Modular Assembler (yasm.exe). - if not exist "$(SolutionDir)libs\yasm.exe" cscript /nologo "$(ProjectDir)..\util.vbs" GetYasmEXE "$(SolutionDir)libs\" - $(ProjectDir)yasm.exe;%(Outputs) - @@ -1642,9 +1638,6 @@ - - {77c9e0a2-177d-4bd6-9efd-75a56f886325} - {20179127-853b-4fe9-b7c0-9e817e6a3a72} diff --git a/libs/win32/libcodec2/libcodec2.2017.vcxproj b/libs/win32/libcodec2/libcodec2.2017.vcxproj index 986051c822..f43955c944 100644 --- a/libs/win32/libcodec2/libcodec2.2017.vcxproj +++ b/libs/win32/libcodec2/libcodec2.2017.vcxproj @@ -49,6 +49,7 @@ + @@ -170,11 +171,6 @@ xcopy "$(ProjectDir)generated\*" "$(libcodec2LibDir)\src\" /C /D /Y - - - {9cfa562c-c611-48a7-90a2-bb031b47fe6d} - - diff --git a/libs/win32/libg722_1/libg722_1.2017.vcxproj b/libs/win32/libg722_1/libg722_1.2017.vcxproj index e272f5e73c..dd3ca8f6eb 100644 --- a/libs/win32/libg722_1/libg722_1.2017.vcxproj +++ b/libs/win32/libg722_1/libg722_1.2017.vcxproj @@ -49,6 +49,7 @@ + @@ -148,11 +149,6 @@ - - - {36603fe1-253f-4c2c-aab6-12927a626135} - - diff --git a/libs/win32/libjpeg/libjpeg.2017.vcxproj b/libs/win32/libjpeg/libjpeg.2017.vcxproj index 7ab8df590a..604d5347ca 100644 --- a/libs/win32/libjpeg/libjpeg.2017.vcxproj +++ b/libs/win32/libjpeg/libjpeg.2017.vcxproj @@ -18,6 +18,7 @@ x64 + diff --git a/libs/win32/libmp3lame/libmp3lame.2017.vcxproj b/libs/win32/libmp3lame/libmp3lame.2017.vcxproj index 9074fc38c8..a66baef99a 100644 --- a/libs/win32/libmp3lame/libmp3lame.2017.vcxproj +++ b/libs/win32/libmp3lame/libmp3lame.2017.vcxproj @@ -45,6 +45,7 @@ v141 + @@ -466,12 +467,6 @@ - - - {d5d2bf72-29fe-4982-a9fa-82ab2086db1b} - false - - diff --git a/libs/win32/libogg/libogg.2017.vcxproj b/libs/win32/libogg/libogg.2017.vcxproj index 58ab9e4dfd..4f91ce79d6 100644 --- a/libs/win32/libogg/libogg.2017.vcxproj +++ b/libs/win32/libogg/libogg.2017.vcxproj @@ -45,6 +45,7 @@ v141 + @@ -197,12 +198,6 @@ - - - {d5d2bf72-29fe-4982-a9fa-82ab1086db1b} - false - - diff --git a/libs/win32/libpng/libpng.2017.vcxproj b/libs/win32/libpng/libpng.2017.vcxproj index f808287b7a..a1641690dc 100644 --- a/libs/win32/libpng/libpng.2017.vcxproj +++ b/libs/win32/libpng/libpng.2017.vcxproj @@ -48,6 +48,7 @@ v141 + @@ -229,11 +230,6 @@ - - - {c2d5eb6d-f4de-4dee-b5b8-b6fd26c22d33} - - diff --git a/libs/win32/libshout/libshout.2017.vcxproj b/libs/win32/libshout/libshout.2017.vcxproj index a387a70a03..3a0350dfd6 100644 --- a/libs/win32/libshout/libshout.2017.vcxproj +++ b/libs/win32/libshout/libshout.2017.vcxproj @@ -45,6 +45,7 @@ v141 + @@ -177,10 +178,6 @@ - - {d5d2bf72-29fe-4982-a9fa-82ab3086db1b} - false - {0feeaec6-4399-4c46-b7db-62ece80d15b4} false diff --git a/libs/win32/libsilk/Silk_FIX.2017.vcxproj b/libs/win32/libsilk/Silk_FIX.2017.vcxproj index 4039879cd9..d43eb300c9 100644 --- a/libs/win32/libsilk/Silk_FIX.2017.vcxproj +++ b/libs/win32/libsilk/Silk_FIX.2017.vcxproj @@ -49,6 +49,7 @@ + @@ -264,11 +265,6 @@ - - - {08782d64-e775-4e96-b707-cc633a226f32} - - diff --git a/libs/win32/libvpx/libvpx.2017.vcxproj b/libs/win32/libvpx/libvpx.2017.vcxproj index 752b587e04..95942997c8 100644 --- a/libs/win32/libvpx/libvpx.2017.vcxproj +++ b/libs/win32/libvpx/libvpx.2017.vcxproj @@ -24,6 +24,7 @@ libvpx ManagedCProj + StaticLibrary @@ -118,12 +119,6 @@ - - Document - Downloading Yasm Modular Assembler (yasm.exe). - if not exist "$(ProjectDir)yasm.exe" cscript /nologo "$(ProjectDir)..\util.vbs" GetYasmEXE "$(ProjectDir)" - $(ProjectDir)yasm.exe;%(Outputs) - $(IntDir)vpx_src_vpx_decoder.obj diff --git a/libs/win32/libx264/libx264.2017.vcxproj b/libs/win32/libx264/libx264.2017.vcxproj index 498a7c4469..0519f270d9 100644 --- a/libs/win32/libx264/libx264.2017.vcxproj +++ b/libs/win32/libx264/libx264.2017.vcxproj @@ -24,6 +24,8 @@ libx264 + + StaticLibrary true @@ -491,11 +493,6 @@ del /f /q $(OutDir)\x264.txt $(VC_IncludePath)\;$(WindowsSDK_IncludePath)\;$(VCInstallDir)\include;%(AdditionalIncludeDirectories) - - - {6d1bc01c-3f97-4c08-8a45-69c9b94281aa} - - diff --git a/libs/win32/libx264/libx264.2015.vcxproj.filters b/libs/win32/libx264/libx264.2017.vcxproj.filters similarity index 99% rename from libs/win32/libx264/libx264.2015.vcxproj.filters rename to libs/win32/libx264/libx264.2017.vcxproj.filters index 910488e902..19608a44ae 100644 --- a/libs/win32/libx264/libx264.2015.vcxproj.filters +++ b/libs/win32/libx264/libx264.2017.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -151,4 +151,4 @@ - \ No newline at end of file + diff --git a/libs/win32/mpg123/libmpg123.2017.vcxproj b/libs/win32/mpg123/libmpg123.2017.vcxproj index 0ae15e003c..87e5544fa6 100644 --- a/libs/win32/mpg123/libmpg123.2017.vcxproj +++ b/libs/win32/mpg123/libmpg123.2017.vcxproj @@ -161,6 +161,7 @@ v141 + @@ -1325,11 +1326,6 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ - - - {e796e337-de78-4303-8614-9a590862ee95} - - diff --git a/libs/win32/opus/opus.2017.vcxproj b/libs/win32/opus/opus.2017.vcxproj index 86ef8e7688..5f4bced56e 100644 --- a/libs/win32/opus/opus.2017.vcxproj +++ b/libs/win32/opus/opus.2017.vcxproj @@ -46,6 +46,7 @@ v141 + @@ -235,14 +236,6 @@ - - {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} - false - false - false - false - false - {245603e3-f580-41a5-9632-b25fe3372cbf} diff --git a/libs/win32/opus/opus.celt.2017.vcxproj b/libs/win32/opus/opus.celt.2017.vcxproj index 8af97696a1..a20a369ec0 100644 --- a/libs/win32/opus/opus.celt.2017.vcxproj +++ b/libs/win32/opus/opus.celt.2017.vcxproj @@ -52,6 +52,7 @@ v141 + @@ -251,11 +252,6 @@ - - - {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} - - diff --git a/libs/win32/opus/opus.silk_common.2017.vcxproj b/libs/win32/opus/opus.silk_common.2017.vcxproj index 6ddf75c73a..0e1526055e 100644 --- a/libs/win32/opus/opus.silk_common.2017.vcxproj +++ b/libs/win32/opus/opus.silk_common.2017.vcxproj @@ -25,6 +25,7 @@ opus.silk_common + StaticLibrary true @@ -306,11 +307,6 @@ - - - {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} - - diff --git a/libs/win32/opus/opus.silk_fixed.2017.vcxproj b/libs/win32/opus/opus.silk_fixed.2017.vcxproj index 16da6b597e..6774124d26 100644 --- a/libs/win32/opus/opus.silk_fixed.2017.vcxproj +++ b/libs/win32/opus/opus.silk_fixed.2017.vcxproj @@ -25,6 +25,7 @@ opus.silk_fixed + StaticLibrary true @@ -191,9 +192,6 @@ - - {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} - {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} diff --git a/libs/win32/opus/opus.silk_float.2017.vcxproj b/libs/win32/opus/opus.silk_float.2017.vcxproj index e420354909..14dc1ffc14 100644 --- a/libs/win32/opus/opus.silk_float.2017.vcxproj +++ b/libs/win32/opus/opus.silk_float.2017.vcxproj @@ -25,6 +25,7 @@ opus.silk_float + StaticLibrary true @@ -242,9 +243,6 @@ - - {092124c9-09ed-43c7-bd6d-4ae5d6b3c547} - {c303d2fc-ff97-49b8-9ddd-467b4c9a0b16} diff --git a/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj b/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj index 4a8dd95ca1..32083ae0e2 100644 --- a/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj +++ b/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj @@ -24,6 +24,7 @@ pocketsphinx + DynamicLibrary false @@ -389,10 +390,6 @@ - - {af8163ee-fa76-4904-a11d-7d70a1b5ba2e} - false - {2f025ead-99bd-40f5-b2cc-f0a28cad7f2d} false diff --git a/libs/win32/portaudio/portaudio.2017.vcxproj b/libs/win32/portaudio/portaudio.2017.vcxproj index 3ba285f451..5401536cf5 100644 --- a/libs/win32/portaudio/portaudio.2017.vcxproj +++ b/libs/win32/portaudio/portaudio.2017.vcxproj @@ -40,6 +40,7 @@ portaudio + StaticLibrary false @@ -852,11 +853,6 @@ - - - {c0779bcc-c037-4f58-b890-ef37ba956b3c} - - diff --git a/libs/win32/pthread/pthread.2017.vcxproj b/libs/win32/pthread/pthread.2017.vcxproj index f9f6f9c817..ce73ff35b4 100644 --- a/libs/win32/pthread/pthread.2017.vcxproj +++ b/libs/win32/pthread/pthread.2017.vcxproj @@ -40,6 +40,7 @@ pthread + DynamicLibrary false @@ -444,12 +445,6 @@ %(AdditionalIncludeDirectories) - - - {8b3b4c4c-13c2-446c-beb0-f412cc2cfb9a} - false - - diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj index faf9b7094a..9e37943036 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2017.vcxproj @@ -49,6 +49,7 @@ v141 + @@ -74,8 +75,7 @@ - if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://files.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\" -cd /D "$(ProjectDir)..\..\sofia-sip\win32\" + cd /D "$(ProjectDir)..\..\sofia-sip\win32\" set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" if not exist "$(ProjectDir)..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c" "autogen.cmd" if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" @@ -107,8 +107,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" - if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://files.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\" -cd /D "$(ProjectDir)..\..\sofia-sip\win32\" + cd /D "$(ProjectDir)..\..\sofia-sip\win32\" set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" if not exist "$(ProjectDir)..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c" "autogen.cmd" if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" @@ -144,8 +143,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" - if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://files.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\" -cd /D "$(ProjectDir)..\..\sofia-sip\win32\" + icd /D "$(ProjectDir)..\..\sofia-sip\win32\" set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" if not exist "$(ProjectDir)..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c" "autogen.cmd" if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" @@ -179,8 +177,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" - if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://files.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\" -cd /D "$(ProjectDir)..\..\sofia-sip\win32\" + cd /D "$(ProjectDir)..\..\sofia-sip\win32\" set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" if not exist "$(ProjectDir)..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c" "autogen.cmd" if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" diff --git a/libs/win32/speex/libspeex.2017.vcxproj b/libs/win32/speex/libspeex.2017.vcxproj index 990bba9591..30945d77fe 100644 --- a/libs/win32/speex/libspeex.2017.vcxproj +++ b/libs/win32/speex/libspeex.2017.vcxproj @@ -65,6 +65,7 @@ libspeex + StaticLibrary MultiByte @@ -637,11 +638,6 @@ - - - {1bdab935-27dc-47e3-95ea-17e024d39c31} - - diff --git a/libs/win32/speex/libspeexdsp.2017.vcxproj b/libs/win32/speex/libspeexdsp.2017.vcxproj index a62eacefda..23b7199f4c 100644 --- a/libs/win32/speex/libspeexdsp.2017.vcxproj +++ b/libs/win32/speex/libspeexdsp.2017.vcxproj @@ -41,6 +41,7 @@ 8.1 + StaticLibrary MultiByte @@ -374,11 +375,6 @@ - - - {1bdab935-27dc-47e3-95ea-17e024d39c31} - - diff --git a/libs/win32/sphinxbase/sphinxbase.2017.vcxproj b/libs/win32/sphinxbase/sphinxbase.2017.vcxproj index 2b4fd6cb22..9babe94f5c 100644 --- a/libs/win32/sphinxbase/sphinxbase.2017.vcxproj +++ b/libs/win32/sphinxbase/sphinxbase.2017.vcxproj @@ -24,6 +24,8 @@ sphinxbase + + DynamicLibrary false @@ -643,16 +645,6 @@ - - - {4f92b672-dadb-4047-8d6a-4bb3796733fd} - false - - - {2dee4895-1134-439c-b688-52203e57d878} - false - - diff --git a/libs/win32/sqlite/sqlite.2017.vcxproj b/libs/win32/sqlite/sqlite.2017.vcxproj index 3c85ec0763..d5b5a3af5c 100644 --- a/libs/win32/sqlite/sqlite.2017.vcxproj +++ b/libs/win32/sqlite/sqlite.2017.vcxproj @@ -41,6 +41,7 @@ Win32Proj + DynamicLibrary MultiByte @@ -327,11 +328,6 @@ - - - {97d25665-34cd-4e0c-96e7-88f0795b8883} - - diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs deleted file mode 100644 index e8bfce9953..0000000000 --- a/libs/win32/util.vbs +++ /dev/null @@ -1,490 +0,0 @@ -' -' Contributor(s): -' Michael Jerris -' David A. Horner http://dave.thehorners.com -'---------------------------------------------- - -' ************** -' Initialization -' ************** - -Set WshShell = CreateObject("WScript.Shell") -Set FSO = CreateObject("Scripting.FileSystemObject") -Set WshSysEnv = WshShell.Environment("SYSTEM") -Set xml = CreateObject("Msxml2.ServerXMLHTTP") -Dim UseWgetEXE - -On Error Resume Next -Set oStream = CreateObject("Adodb.Stream") -On Error Goto 0 - -If Not IsObject(oStream) Then - wscript.echo("Failed to create Adodb.Stream, using alternative download method.") - UseWgetEXE=true -Else - UseWgetEXE=false -End If -Randomize -Set objArgs = WScript.Arguments -quote=Chr(34) -ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) -UtilsDir=Showpath(ScriptDir) -ToolsBase="http://files.freeswitch.org/downloads/win32/" - -If UseWgetEXE Then - GetWgetEXE UtilsDir -End If - -If objArgs.Count >=3 Then - Select Case objArgs(0) - Case "Get" - Wget objArgs(1), Showpath(objArgs(2)) - Case "GetUnzip" - WgetUnCompress objArgs(1), Showpath(objArgs(2)) - Case "GetUnzipSounds" - WgetSounds objArgs(1), objArgs(2), Showpath(objArgs(3)), objArgs(4) - Case "Version" - 'CreateVersion(tmpFolder, VersionDir, includebase, includedest) - CreateVersion Showpath(objArgs(1)), Showpath(objArgs(2)), objArgs(3), objArgs(4) - End Select -End If - -If objArgs.Count = 2 Then - Select Case objArgs(0) - Case "GetYasmEXE" - GetYasmEXE objArgs(1) - Case "GetVSYasmEXE" - GetVSYasmEXE objArgs(1) - End Select -End If - -' ******************* -' Utility Subroutines -' ******************* - -Sub WgetSounds(PrimaryName, Freq, DestFolder, VersionFile) - BaseURL = "http://files.freeswitch.org/releases/sounds/freeswitch-sounds" - Set objFSO = CreateObject("Scripting.FileSystemObject") - Set objTextFile = objFSO.OpenTextFile(VersionFile,1) - Do Until objTextFile.AtEndOfStream - strLine = objTextFile.Readline - if Len(strLine) > 2 then - versionPos = InstrRev(strLine, " ", -1, 1) - name = Left(strLine, versionPos-1) - if name = PrimaryName Then - version = Right(strLine, Len(strLine) - versionPos) - Wscript.Echo "Sound name: " & name & " Version " & version - URL = BaseURL & "-" & name & "-" & Freq &"-" & version & ".tar.gz" - Wscript.Echo "URL: " & URL - WgetUnCompress URL, Showpath(DestFolder) - End If - End if - Loop -End Sub - -Sub WgetUnCompress(URL, DestFolder) - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - StartPos = InstrRev(URL, "/", -1, 1) - strlength = Len(URL) - filename=Right(URL,strlength-StartPos) - NameEnd = InstrRev(filename, ".",-1, 1) - filestrlength = Len(filename) - filebase = Left(filename,NameEnd) - fileext = Right(filename, Len(filename) - NameEnd) - Wget URL, DestFolder - If fileext = "zip" Then - UnCompress Destfolder & filename, DestFolder - Else - UnCompress Destfolder & filename, DestFolder - End If -End Sub - -Sub GetCompressionTools(DestFolder) - Dim tries - Dim max_tries - Dim MyFile - - tries = 0 - max_tries = 10 - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - If Not FSO.FileExists(DestFolder & "7za1701.exe") Then - On Error Resume Next - Set MyFile = FSO.CreateTextFile(DestFolder & "7za.tag", False) - If Err <> 0 Then Wscript.echo("Downloading 7za: " & DestFolder & "7za.tag - " & Err.Description) End If - On Error Goto 0 - If Not IsEmpty(MyFile) Then - MyFile.WriteLine("This file marks a pending download for 7za1701.exe so we don't download it twice at the same time") - MyFile.Close - Wget ToolsBase & "7za1701.exe", DestFolder - FSO.DeleteFile DestFolder & "7za.tag", true - Wscript.echo("Downloaded 7za1701.exe") - End If - Set MyFile = Nothing - WScript.Sleep(500) - End If - Do While FSO.FileExists(DestFolder & "7za.tag") And tries < max_tries - Wscript.echo("Waiting for 7za1701.exe to be downloaded") - WScript.Sleep(1000) - tries = tries + 1 - Loop - If tries = max_tries Then - Wscript.echo("ERROR: Download of 7za1701.exe takes too much time") - Wscript.quit 99 - End If -End Sub - -Sub GetWgetEXE(DestFolder) - Dim oExec - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - If Not FSO.FileExists(DestFolder & "wget.exe") Then - Slow_Wget ToolsBase & "wget.exe", DestFolder - End If -End Sub - -Sub GetYasmEXE(DestFolder) - Dim oExec - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - If Not FSO.FileExists(DestFolder & "yasm.exe") Then - Wget ToolsBase & "yasm.exe", DestFolder - End If -End Sub - -Sub GetVSYasmEXE(DestFolder) - Dim oExec - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - If Not FSO.FileExists(DestFolder & "vsyasm.exe") Then - Wget ToolsBase & "vsyasm.exe", DestFolder - End If -End Sub - -Function Strip(Str) - Set oRE = New Regexp - oRE.Pattern = "[\W_]" - oRE.Global = True - Strip = Right(oRE.Replace(Str, ""), 20) -End Function - -Sub ExecPrintOutput(Str) - Dim Process - - Set Process = WshShell.Exec(Str) - - Do - If Not Process.StdOut.atEndOfStream Then - WScript.Echo Process.StdOut.ReadLine() - End If - Loop Until (Process.Status <> 0) And (Process.StdOut.atEndOfStream) - - Process.Terminate - WScript.Sleep(500) -End Sub - -Sub UnCompress(Archive, DestFolder) - Dim Fn - Dim batname - Dim MyFile - - GetCompressionTools UtilsDir - - batname = "tmp" & Strip(Archive) & CStr(Int(10000*Rnd)) & ".bat" - wscript.echo("Extracting: " & Archive & " - using: " & batname) - Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True) - MyFile.WriteLine("@" & quote & UtilsDir & "7za1701.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote ) - MyFile.Close - Set MyFile = Nothing - ExecPrintOutput(UtilsDir & batname) - wscript.echo("Ready extracting: " & Archive) - Fn = fso.GetParentFolderName(Archive) & "\" & FSO.getbasename(Archive) - If FSO.FileExists(Fn) Then - Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True) - MyFile.WriteLine("@" & quote & UtilsDir & "7za1701.exe" & quote & " x " & quote & Fn & quote & " -y -o" & quote & DestFolder & quote ) - MyFile.Close - Set MyFile = Nothing - ExecPrintOutput(UtilsDir & batname) - wscript.echo("Ready extracting: " & Fn) - wscript.echo("Deleting: " & Fn) - FSO.DeleteFile Fn,true - End If - If FSO.FileExists(Fn) Then - Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True) - MyFile.WriteLine("@" & quote & UtilsDir & "7za1701.exe" & quote & " x " & quote & Fn & quote & " -y -o" & quote & DestFolder & quote ) - MyFile.Close - Set MyFile = Nothing - ExecPrintOutput(UtilsDir & batname) - wscript.echo("Ready extracting: " & Fn ) - wscript.echo("Deleting: " & Fn) - FSO.DeleteFile Fn,true - End If - - WScript.Sleep(500) - If FSO.FileExists(UtilsDir & batname) Then - FSO.DeleteFile UtilsDir & batname, True - End If -End Sub - -Sub Wget(URL, DestFolder) - Dim MyFile - - StartPos = InstrRev(URL, "/", -1, 1) - strlength = Len(URL) - filename=Right(URL,strlength-StartPos) - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - - If UseWgetEXE Then - Wscript.echo("wget: " & URL) - batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" - Set MyFile = FSO.CreateTextFile(UtilsDir & batname, True) - MyFile.WriteLine("@cd " & quote & DestFolder & quote) - MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL) - MyFile.Close - Set MyFile = Nothing - ExecPrintOutput(UtilsDir & batname) - Else - Wscript.echo("XMLHTTP GET: " & URL) - - xml.Open "GET", URL, False - xml.Send - - Const adTypeBinary = 1 - Const adSaveCreateOverWrite = 2 - Const adSaveCreateNotExist = 1 - - oStream.type = adTypeBinary - oStream.open - oStream.write xml.responseBody - oStream.savetofile DestFolder & filename, adSaveCreateOverWrite - oStream.close - End If - -End Sub - -Sub Slow_Wget(URL, DestFolder) - Dim MyFile - - StartPos = InstrRev(URL, "/", -1, 1) - strlength = Len(URL) - filename=Right(URL,strlength-StartPos) - If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If - - Wscript.echo("Downloading: " & URL) - xml.Open "GET", URL, False - xml.Send - - const ForReading = 1 , ForWriting = 2 , ForAppending = 8 - Set MyFile = FSO.OpenTextFile(DestFolder & filename ,ForWriting, True) - For i = 1 to lenb(xml.responseBody) - MyFile.write Chr(Ascb(midb(xml.responseBody,i,1))) - Next - MyFile.Close() - Set MyFile = Nothing - -End Sub - -Function Showpath(folderspec) - Set f = FSO.GetFolder(folderspec) - showpath = f.path & "\" -End Function - - -Function FindVersionStringInConfigure(strConfigFile, strVersionString) - - Set objRegEx = CreateObject("VBScript.RegExp") - objRegEx.Pattern = "[^#]AC_SUBST\(" & strVersionString & ".*\[([^\[]*)\]" - - Set objFSO = CreateObject("Scripting.FileSystemObject") - Set objFile = objFSO.OpenTextFile(strConfigFile, 1) - strSearchString = objFile.ReadAll - objFile.Close - - Set colMatches = objRegEx.Execute(strSearchString) - - strResult = "" - If colMatches.Count > 0 Then - For Each strMatch in colMatches - strResult = objRegEx.Replace(strMatch.Value, "$1") - Next - End If - - FindVersionStringInConfigure = strResult - -End Function - -Sub FindReplaceInFile(FileName, sFind, sReplace) - Const OpenAsASCII = 0 ' Opens the file as ASCII (TristateFalse) - Const OpenAsUnicode = -1 ' Opens the file as Unicode (TristateTrue) - Const OpenAsDefault = -2 ' Opens the file using the system default - - Const OverwriteIfExist = -1 - Const FailIfNotExist = 0 - Const ForReading = 1 - - Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII) -' Wscript.echo("FindReplaceInFile: " & FileName & " s/" & sFind & "/" & sReplace) - sText = fOrgFile.ReadAll - fOrgFile.Close - sText = Replace(sText, sFind, sReplace) - Set fNewFile = FSO.CreateTextFile(FileName, OverwriteIfExist, OpenAsASCII) - fNewFile.WriteLine sText - fNewFile.Close -End Sub - -Function ExecAndGetResult(tmpFolder, VersionDir, execStr) - Dim MyFile - - Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpExec.Bat", True) - MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote) - MyFile.WriteLine("@" & execStr) - MyFile.Close - Set MyFile = Nothing - - Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpExec.Bat" & quote) - - ExecAndGetResult = Trim(OExec.StdOut.ReadLine()) - - Do - Loop Until (oExec.Status <> 0) And (oExec.StdOut.atEndOfStream) - - oExec.Terminate - WScript.Sleep(500) - - FSO.DeleteFile(tmpFolder & "tmpExec.Bat") - -End Function - -Function ExecAndGetExitCode(tmpFolder, VersionDir, execStr) - Dim MyFile - - Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpExec.Bat", True) - MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote) - MyFile.WriteLine("@" & execStr) - MyFile.WriteLine("@exit %ERRORLEVEL%") - MyFile.Close - Set MyFile = Nothing - - ExecAndGetExitCode = WshShell.Run("cmd /C " & quote & tmpFolder & "tmpExec.Bat" & quote, 0, True) - - FSO.DeleteFile(tmpFolder & "tmpExec.Bat") - -End Function - -Function pd(n, totalDigits) - If totalDigits > len(n) then - pd = String(totalDigits-len(n),"0") & n - Else - pd = n - End If -End Function - -Function GetTimeUTC() - - iOffset = WshShell.RegRead("HKLM\System\CurrentControlSet\Control\TimeZoneInformation\ActiveTimeBias") - - If IsNumeric(iOffset) Then - GetTimeUTC = DateAdd("n", iOffset, Now()) - Else - GetTimeUTC = Now() - End If - -End Function - -Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) - Dim oExec - - Wscript.echo("Checking if we're building a newer git version") - - strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MAJOR") - strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MINOR") - strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MICRO") - strVerRev = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION") - strVerHuman = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION_HUMAN") - - 'Set version to the one reported by configure.in - If strVerRev <> "" Then - VERSION = strVerRev - End If - - Dim sLastFile - Const ForReading = 1 - Const ShowUnclean = False 'Don't show unclean state for now - - 'Try To read revision from git - If FSO.FolderExists(VersionDir & ".git") Then - 'Get timestamp for last commit - strFromProc = ExecAndGetResult(tmpFolder, VersionDir, "git log -n1 --format=" & quote & "%%ct" & quote & " HEAD") - If IsNumeric(strFromProc) Then - lastChangedDateTime = DateAdd("s", strFromProc, "01/01/1970 00:00:00") - strLastCommit = YEAR(lastChangedDateTime) & Pd(Month(lastChangedDateTime), 2) & Pd(DAY(lastChangedDateTime), 2) & "T" & Pd(Hour(lastChangedDateTime), 2) & Pd(Minute(lastChangedDateTime), 2) & Pd(Second(lastChangedDateTime), 2) & "Z" - strLastCommitHuman = YEAR(lastChangedDateTime) & "-" & Pd(Month(lastChangedDateTime), 2) & "-" & Pd(DAY(lastChangedDateTime), 2) & " " & Pd(Hour(lastChangedDateTime), 2) & ":" & Pd(Minute(lastChangedDateTime), 2) & ":" & Pd(Second(lastChangedDateTime), 2) & "Z" - Else - strLastCommit = "" - strLastCommitHuman = "" - End If - - 'Get revision hash - strRevision = ExecAndGetResult(tmpFolder, VersionDir, "git rev-list -n1 --abbrev=10 --abbrev-commit HEAD") - strRevisionHuman = ExecAndGetResult(tmpFolder, VersionDir, "git rev-list -n1 --abbrev=7 --abbrev-commit HEAD") - - If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" And strRevisionHuman <> "" Then - 'Build version string - strGitVer = "+git~" & strLastCommit & "~" & strRevision - strVerHuman = "git " & strRevisionHuman & " " & strLastCommitHuman - - 'Check for local changes, if found, append to git revision string - If ShowUnclean Then - If ExecAndGetExitCode(tmpFolder, VersionDir, "git diff-index --quiet HEAD") <> 0 Then - lastChangedDateTime = GetTimeUTC() - strGitVer = strGitVer & "+unclean~" & YEAR(lastChangedDateTime) & Pd(Month(lastChangedDateTime), 2) & Pd(DAY(lastChangedDateTime), 2) & "T" & Pd(Hour(lastChangedDateTime), 2) & Pd(Minute(lastChangedDateTime), 2) & Pd(Second(lastChangedDateTime), 2) & "Z" - strVerHuman = strVerHuman & " unclean " & YEAR(lastChangedDateTime) & "-" & Pd(Month(lastChangedDateTime), 2) & "-" & Pd(DAY(lastChangedDateTime), 2) & " " & Pd(Hour(lastChangedDateTime), 2) & ":" & Pd(Minute(lastChangedDateTime), 2) & ":" & Pd(Second(lastChangedDateTime), 2) & "Z" - End If - End If - Else - strGitVer = "" - strVerHuman = "" - End If - - VERSION=VERSION & strGitVer - - sLastVersion = "" - Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, True, OpenAsASCII) - If Not sLastFile.atEndOfStream Then - sLastVersion = sLastFile.ReadLine() - End If - sLastFile.Close - Set sLastFile = Nothing - End If - - Source = "source code" - If FSO.GetExtensionName(includedest) <> "inc" Then - Dim IncFn - - IncFn = VersionDir & "\w32\Library\switch_version.inc" - If FSO.FileExists(IncFn) Then - Wscript.echo("CreateVersion: deleting - " & IncFn) - FSO.DeleteFile IncFn - End If - Else - Source = "resource files" - End If - - sNewVersion = VERSION & " " & strVerHuman - If sNewVersion <> sLastVersion Or not FSO.FileExists(includedest) Then - Dim MyFile - - Set MyFile = FSO.CreateTextFile(tmpFolder & "lastversion", True) - MyFile.WriteLine(sNewVersion) - MyFile.Close - Set MyFile = Nothing - - Wscript.echo("Updating " & Source & " from " & sLastVersion & " to " & sNewVersion) - - FSO.CopyFile includebase, includedest, true - FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION@", VERSION - FindReplaceInFile includedest, "@SWITCH_VERSION_MAJOR@", strVerMajor - FindReplaceInFile includedest, "@SWITCH_VERSION_MINOR@", strVerMinor - FindReplaceInFile includedest, "@SWITCH_VERSION_MICRO@", strVerMicro - FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION_HUMAN@", strVerHuman - FindReplaceInFile includedest, "@SWITCH_VERSION_YEAR@", YEAR(lastChangedDateTime) - End If - -End Sub - diff --git a/w32/Library/FreeSwitchCore.2017.vcxproj b/w32/Library/FreeSwitchCore.2017.vcxproj index 55e2c23754..5e1205f5bc 100644 --- a/w32/Library/FreeSwitchCore.2017.vcxproj +++ b/w32/Library/FreeSwitchCore.2017.vcxproj @@ -47,6 +47,7 @@ v141 + @@ -821,37 +822,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs true true - - Generating switch_version.h - cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h" - - ..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs) - ..\..\src\include\switch_version.h;lastversion;%(Outputs) - Generating switch_version.h - cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h" - - ..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs) - ..\..\src\include\switch_version.h;lastversion;%(Outputs) - Generating switch_version.h - cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h" - - ..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs) - ..\..\src\include\switch_version.h;lastversion;%(Outputs) - Generating switch_version.h - cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h" - - ..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c;%(AdditionalInputs) - ..\..\src\include\switch_version.h;lastversion;%(Outputs) - - - Generating switch_version.inc - cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)switch_version.inc.template" "$(ProjectDir)switch_version.inc" - $(ProjectDir)switch_version.inc - $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion - $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion - $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion - $ProjectDir)include\switch_version.h;$(ProjectDir)lastversion - diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj index 6aa691a187..894ae0be37 100644 --- a/w32/Setup/Setup.2017.wixproj +++ b/w32/Setup/Setup.2017.wixproj @@ -1,9 +1,10 @@  - + true + @@ -17,26 +18,26 @@ bin\x86\Debug\ obj\X86\$(Configuration)\ - Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration);PlatformDir=Win32; + Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration); bin\x86\release\ obj\X86\$(Configuration)\ - FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\release\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration); + FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration); bin\x64\Debug\ obj\X64\$(Configuration)\ - Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration); + Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration); bin\x64\Release\ obj\X64\$(Configuration)\ - FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\release\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration); + FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration); @@ -876,16 +877,6 @@ - - "$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs" -"$(WixToolPath)\heat.exe" dir "$(SolutionDir)Win32\$(Configuration)\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs" -"$(WixToolPath)\heat.exe" dir "$(SolutionDir)Win32\$(Configuration)" -t $(ProjectDir)filter.xslt -cg FreeSWITCHBaseFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.FreeSWITCHBaseDir -out "$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs" - - - "$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs" -"$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs" -"$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)" -t $(ProjectDir)filter.xslt -cg FreeSWITCHBaseFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.FreeSWITCHBaseDir -out "$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs" - @@ -908,12 +899,17 @@ + + + + + - + @@ -921,6 +917,61 @@ + + + + + + + + + diff --git a/w32/broadvoice.props b/w32/broadvoice.props index 5d1f423662..0a4c81e461 100644 --- a/w32/broadvoice.props +++ b/w32/broadvoice.props @@ -2,6 +2,7 @@ + $(SolutionDir)libs\broadvoice-$(broadvoice_Version)\src diff --git a/w32/download_LAME.props b/w32/download_LAME.props new file mode 100644 index 0000000000..c3f5177665 --- /dev/null +++ b/w32/download_LAME.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_LDNS.props b/w32/download_LDNS.props new file mode 100644 index 0000000000..445fe9a2b9 --- /dev/null +++ b/w32/download_LDNS.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_OGG.props b/w32/download_OGG.props new file mode 100644 index 0000000000..1761c949a5 --- /dev/null +++ b/w32/download_OGG.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_broadvoice.props b/w32/download_broadvoice.props new file mode 100644 index 0000000000..ed2c8a0200 --- /dev/null +++ b/w32/download_broadvoice.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_celt.props b/w32/download_celt.props new file mode 100644 index 0000000000..b6ae91ca22 --- /dev/null +++ b/w32/download_celt.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_freetype.props b/w32/download_freetype.props new file mode 100644 index 0000000000..4a6b55d996 --- /dev/null +++ b/w32/download_freetype.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_g722_1.props b/w32/download_g722_1.props new file mode 100644 index 0000000000..14a6c816aa --- /dev/null +++ b/w32/download_g722_1.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_iLBC.props b/w32/download_iLBC.props new file mode 100644 index 0000000000..20bf9f014a --- /dev/null +++ b/w32/download_iLBC.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libav.props b/w32/download_libav.props new file mode 100644 index 0000000000..0339e1114e --- /dev/null +++ b/w32/download_libav.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libcodec2.props b/w32/download_libcodec2.props new file mode 100644 index 0000000000..d045576fb5 --- /dev/null +++ b/w32/download_libcodec2.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libjpeg.props b/w32/download_libjpeg.props new file mode 100644 index 0000000000..aa34eb24a3 --- /dev/null +++ b/w32/download_libjpeg.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libpng.props b/w32/download_libpng.props new file mode 100644 index 0000000000..faa7a17716 --- /dev/null +++ b/w32/download_libpng.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libshout.props b/w32/download_libshout.props new file mode 100644 index 0000000000..0832ca2cd4 --- /dev/null +++ b/w32/download_libshout.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libsilk.props b/w32/download_libsilk.props new file mode 100644 index 0000000000..dc9d99c6bb --- /dev/null +++ b/w32/download_libsilk.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_libx264.props b/w32/download_libx264.props new file mode 100644 index 0000000000..4902cedfd6 --- /dev/null +++ b/w32/download_libx264.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_mpg123.props b/w32/download_mpg123.props new file mode 100644 index 0000000000..7e3353c5e8 --- /dev/null +++ b/w32/download_mpg123.props @@ -0,0 +1,46 @@ + + + + + + + true + + + + + + + + + + + + diff --git a/w32/download_opus.props b/w32/download_opus.props new file mode 100644 index 0000000000..a1859f3dbd --- /dev/null +++ b/w32/download_opus.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_pocketsphinx.props b/w32/download_pocketsphinx.props new file mode 100644 index 0000000000..87c99f57fa --- /dev/null +++ b/w32/download_pocketsphinx.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_portaudio.props b/w32/download_portaudio.props new file mode 100644 index 0000000000..8a9b16049e --- /dev/null +++ b/w32/download_portaudio.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_pthreads.props b/w32/download_pthreads.props new file mode 100644 index 0000000000..1c653e2962 --- /dev/null +++ b/w32/download_pthreads.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_sounds.props b/w32/download_sounds.props new file mode 100644 index 0000000000..1c17ae9350 --- /dev/null +++ b/w32/download_sounds.props @@ -0,0 +1,29 @@ + + + + + + + + + $(SoundPrimaryName.Replace("-","_"))$(SoundQuality) + + + + + + + + + + + diff --git a/w32/download_speex.props b/w32/download_speex.props new file mode 100644 index 0000000000..503db016a1 --- /dev/null +++ b/w32/download_speex.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_sphinxbase.props b/w32/download_sphinxbase.props new file mode 100644 index 0000000000..a916bf8609 --- /dev/null +++ b/w32/download_sphinxbase.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_sphinxmodel.props b/w32/download_sphinxmodel.props new file mode 100644 index 0000000000..3141ef634d --- /dev/null +++ b/w32/download_sphinxmodel.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_sqlite.props b/w32/download_sqlite.props new file mode 100644 index 0000000000..5ec04a3774 --- /dev/null +++ b/w32/download_sqlite.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/download_tiff.props b/w32/download_tiff.props new file mode 100644 index 0000000000..5b2e0a09af --- /dev/null +++ b/w32/download_tiff.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/downloadpackage.task b/w32/downloadpackage.task index 4f82d42e68..9c7471659f 100644 --- a/w32/downloadpackage.task +++ b/w32/downloadpackage.task @@ -13,6 +13,7 @@ + @@ -54,6 +55,7 @@ using System.Diagnostics; public string outputfolder { get; set; } public string outputfilename { get; set; } public string extractto { get; set; } + public string moveafter { get; set; } internal static bool FileOrDirectoryExists(string name) { @@ -136,19 +138,33 @@ using System.Diagnostics; if (File.Exists(output)) { // Successful download. + + string extracttofolder = Path.GetFullPath((extractto ?? Path.GetDirectoryName(output)) + "/"); + if (Path.GetExtension(output) != ".exe") { - Extract(output); - string filename = Path.Combine(Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output)); + Extract(output, extracttofolder); + string filename = Path.Combine(Path.GetDirectoryName(extracttofolder), Path.GetFileNameWithoutExtension(output)); Log.LogMessage(MessageImportance.High, "Filename \"" + filename + "\"."); if (File.Exists(filename)) { - Extract(filename); + Extract(filename, extracttofolder); File.Delete(filename); } } + + if (moveafter != null && moveafter != "") { + var items = moveafter.Split('|'); + string s = extracttofolder + items[0]; + string d = extracttofolder + items[1]; + + Log.LogMessage(MessageImportance.High, + "Move directory from \"" + s + "\" to \"" + d + "\"."); + + Directory.Move(s, d); + } } } @@ -164,10 +180,8 @@ using System.Diagnostics; return true; } - private void Extract(string filename) + private void Extract(string filename, string extracttofolder) { - string extracttofolder = Path.GetFullPath((extractto ?? Path.GetDirectoryName(filename)) + "/"); - string arctool = Path.Combine(new string[] { basedir, "libs", "win32", "7za1701.exe" }); string args = " x \"" + filename + "\" -y -o\"" + extracttofolder + "\""; diff --git a/w32/gawk.props b/w32/gawk.props new file mode 100644 index 0000000000..67e4318db0 --- /dev/null +++ b/w32/gawk.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/sound_tools.props b/w32/sound_tools.props new file mode 100644 index 0000000000..6e947feeb6 --- /dev/null +++ b/w32/sound_tools.props @@ -0,0 +1,107 @@ + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w32/switch_version.props b/w32/switch_version.props new file mode 100644 index 0000000000..4825ff7bd9 --- /dev/null +++ b/w32/switch_version.props @@ -0,0 +1,95 @@ + + + + + + + + true + + + + + + + + v = new Dictionary(); + + string year = DateTime.UtcNow.Year.ToString(); + v.Add("SWITCH_VERSION_YEAR", year); + + foreach (Match m in Regex.Matches(ConfigureAC, pattern)) { + v.Add(m.Groups[1].Value.Trim(), m.Groups[2].Value.Trim()); + Log.LogMessage(MessageImportance.High, + m.Groups[1].Value + " = '" + m.Groups[2].Value + "'"); + } + + //--------------------------------------------------------- + Log.LogMessage(MessageImportance.High, + "Generating switch_version.h"); + + TemplatePath = basedir + @"src\include\switch_version.h.template"; + DestinationPath = basedir + @"src\include\switch_version.h"; + + string template = File.ReadAllText(TemplatePath); + foreach (var version_bit in v) { + template = template.Replace("@" + version_bit.Key + "@", version_bit.Value); + } + + File.WriteAllText(DestinationPath, template); + + //--------------------------------------------------------- + Log.LogMessage(MessageImportance.High, + "Generating switch_version.inc"); + + TemplatePath = @"$(ProjectDir)\switch_version.inc.template"; + DestinationPath = @"$(ProjectDir)\switch_version.inc"; + + template = File.ReadAllText(TemplatePath); + foreach (var version_bit in v) { + template = template.Replace("@" + version_bit.Key + "@", version_bit.Value); + } + + File.WriteAllText(DestinationPath, template); + + //--------------------------------------------------------- + + return true; + } + } +]]> + + + + + + + + + + diff --git a/w32/vsyasm.props b/w32/vsyasm.props new file mode 100644 index 0000000000..7281b65832 --- /dev/null +++ b/w32/vsyasm.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + + diff --git a/w32/yasm.props b/w32/yasm.props new file mode 100644 index 0000000000..3ebcc6c84c --- /dev/null +++ b/w32/yasm.props @@ -0,0 +1,40 @@ + + + + + + + true + + + + + + + + +