diff --git a/.gitignore b/.gitignore index f6770717d5..032feaa108 100644 --- a/.gitignore +++ b/.gitignore @@ -279,6 +279,7 @@ libs/opencv-*.zip libs/broadvoice-*.zip libs/lua-*.zip libs/g722_1-*.zip +libs/ilbc-*.zip libs/SharpZipLib.*/ libs/SharpZipLib.*.nupkg libs/nasm-*/ diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 14e239bfaf..2771e97af6 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -319,8 +319,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\spee EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libs\win32\speex\libspeexdsp.2017.vcxproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\win32\ilbc\libilbc.2017.vcxproj", "{9A5DDF08-C88C-4A35-B7F6-D605228446BD}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opal", "src\mod\endpoints\mod_opal\mod_opal.2017.vcxproj", "{05C9FB27-480E-4D53-B3B7-6338E2526666}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpoints\mod_skinny\mod_skinny.2017.vcxproj", "{CC1DD008-9406-448D-A0AD-33C3186CFADB}" @@ -1334,17 +1332,6 @@ Global {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Win32.Build.0 = Release|Win32 {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.ActiveCfg = Release|x64 {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.Build.0 = Release|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|Win32.ActiveCfg = Release|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64.ActiveCfg = Release|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.All|x64.Build.0 = Release|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|Win32.Build.0 = Debug|Win32 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x64.ActiveCfg = Debug|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Debug|x64.Build.0 = Debug|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|Win32.ActiveCfg = Release|Win32 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|Win32.Build.0 = Release|Win32 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.ActiveCfg = Release|x64 - {9A5DDF08-C88C-4A35-B7F6-D605228446BD}.Release|x64.Build.0 = Release|x64 {05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.ActiveCfg = Release|Win32 {05C9FB27-480E-4D53-B3B7-6338E2526666}.All|Win32.Build.0 = Release|Win32 {05C9FB27-480E-4D53-B3B7-6338E2526666}.All|x64.ActiveCfg = Release|Win32 @@ -2372,7 +2359,6 @@ Global {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {9A5DDF08-C88C-4A35-B7F6-D605228446BD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {05C9FB27-480E-4D53-B3B7-6338E2526666} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {CC1DD008-9406-448D-A0AD-33C3186CFADB} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {48414740-C693-4968-9846-EE058020C64F} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} diff --git a/libs/win32/ilbc/libilbc.2017.vcxproj b/libs/win32/ilbc/libilbc.2017.vcxproj deleted file mode 100644 index 23d5c3fa7e..0000000000 --- a/libs/win32/ilbc/libilbc.2017.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libilbc - {9A5DDF08-C88C-4A35-B7F6-D605228446BD} - libilbc - Win32Proj - - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - 4127;%(DisableSpecificWarnings) - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - 4127;%(DisableSpecificWarnings) - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - 4127;%(DisableSpecificWarnings) - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBilbc_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - 4127;%(DisableSpecificWarnings) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.2017.vcxproj b/src/mod/codecs/mod_ilbc/mod_ilbc.2017.vcxproj index e754881e9d..38d24f1b37 100644 --- a/src/mod/codecs/mod_ilbc/mod_ilbc.2017.vcxproj +++ b/src/mod/codecs/mod_ilbc/mod_ilbc.2017.vcxproj @@ -125,10 +125,6 @@ - - {9a5ddf08-c88c-4a35-b7f6-d605228446bd} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/w32/download_iLBC.props b/w32/download_iLBC.props deleted file mode 100644 index 20bf9f014a..0000000000 --- a/w32/download_iLBC.props +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - - - - - - - - - diff --git a/w32/ilbc-version.props b/w32/ilbc-version.props index 76d35e0705..5841849523 100644 --- a/w32/ilbc-version.props +++ b/w32/ilbc-version.props @@ -3,6 +3,7 @@ 0.0.1 + 1 true @@ -13,5 +14,8 @@ $(iLBC_Version) + + $(iLBC_BuildNumber) + - \ No newline at end of file + diff --git a/w32/ilbc.props b/w32/ilbc.props index 9e516c1485..36e0068692 100644 --- a/w32/ilbc.props +++ b/w32/ilbc.props @@ -2,14 +2,58 @@ + - $(SolutionDir)libs\iLBC-$(iLBC_Version) + $(BaseDir)libs\ilbc-$(iLBC_Version)_$(iLBC_BuildNumber) + + + + + + + + + + - $(iLBCLibDir)\src;$(iLBCLibDir)\src\ilbc;$(iLBCLibDir)\src\msvc;%(AdditionalIncludeDirectories) - $(SolutionDir)\libs\codec\ilbc\$(OutDir);%(AdditionalLibraryDirectories) + $(iLBCLibDir)\include;$(iLBCLibDir)\include\ilbc;%(AdditionalIncludeDirectories) + + $(iLBCLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + libilbc.lib;%(AdditionalDependencies) + - \ No newline at end of file +