diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln index 580be3cd79..64ec54f3d0 100644 --- a/Freeswitch.2015.sln +++ b/Freeswitch.2015.sln @@ -562,8 +562,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.2015.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libv8", "libs\win32\v8\libv8.2015.vcxproj", "{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2015.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}" @@ -2535,17 +2533,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 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|Win32.ActiveCfg = Debug|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.ActiveCfg = Debug|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.Build.0 = Debug|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.Build.0 = Debug|Win32 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.ActiveCfg = Debug|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.Build.0 = Debug|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.ActiveCfg = Release|Win32 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.Build.0 = Release|Win32 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.ActiveCfg = Release|x64 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.Build.0 = Release|x64 {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 @@ -3208,7 +3195,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} - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} = {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} diff --git a/libs/.gitignore b/libs/.gitignore index a567a23673..8862900d89 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -794,6 +794,7 @@ opal /zeromq-*/ /jpeg-8d/ /v8-*/ +/v8-*.zip # build products we should remove !/apr-util/xml/expat/conftools/config.guess diff --git a/libs/win32/v8/build-v8.bat b/libs/win32/v8/build-v8.bat deleted file mode 100644 index 24268ba1b8..0000000000 --- a/libs/win32/v8/build-v8.bat +++ /dev/null @@ -1,127 +0,0 @@ -@ECHO OFF - -REM First argument is the target architecture -REM Second argument is "Debug" or "Release" mode -REM Third argument is the V8 root directory path -REM Fourth argument is the version of Visual Studio (optional) - -IF "%1" == "" GOTO Fail -IF "%2" == "" GOTO Fail -IF "%3" == "" GOTO Fail - -REM Go into the V8 lib directory -cd "%3" - -REM Check the last build info, so we know if we're supposed to build again or not -SET /P LAST_BUILD_INFO= last_build - -exit /b 0 - -:Fail -REM Delete the last_build info if this build failed! -@del /Q last_build -exit /b 1 diff --git a/libs/win32/v8/libv8.2015.vcxproj b/libs/win32/v8/libv8.2015.vcxproj deleted file mode 100644 index 7d9848badd..0000000000 --- a/libs/win32/v8/libv8.2015.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libv8 - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} - libv8 - Win32Proj - 8.1 - - - - Utility - NotSet - v140 - false - - - Utility - NotSet - v140 - false - - - Utility - NotSet - v140 - false - - - Utility - NotSet - v140 - false - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\V8\$(Configuration)\ - $(PlatformName)\V8\$(Configuration)\ - $(PlatformName)\V8\$(Configuration)\ - $(PlatformName)\V8\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - X64 - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - X64 - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - Document - Building Google V8 - $(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-$(V8Version)" - - $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) - Building Google V8 - $(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - - $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) - Building Google V8 - $(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-$(V8Version)" - - $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) - Building Google V8 - $(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - - $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) - - - - - - \ No newline at end of file diff --git a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj index dfdf26e0ec..df75233dc6 100644 --- a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj +++ b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj @@ -210,10 +210,6 @@ {89385c74-5860-4174-9caf-a39e7c48909c} - - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} - false - {87ee9da4-de1e-4448-8324-183c98dca588} false diff --git a/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj index fe03185da7..855c6b69d0 100644 --- a/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj +++ b/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj @@ -185,10 +185,6 @@ - - {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} - false - {87ee9da4-de1e-4448-8324-183c98dca588} false diff --git a/w32/v8-version.props b/w32/v8-version.props index a0b442cd5b..f31874859d 100644 --- a/w32/v8-version.props +++ b/w32/v8-version.props @@ -4,7 +4,7 @@ - 5.6.326 + 6.1.298 true diff --git a/w32/v8.props b/w32/v8.props index 58449a57c1..c041e5b5f7 100644 --- a/w32/v8.props +++ b/w32/v8.props @@ -1,7 +1,6 @@  - @@ -30,25 +29,35 @@ extractto: Folder to extract an archive to --> - + + + + - - - + + + + + + + @@ -58,8 +67,8 @@ %(PreprocessorDefinitions) - $(SolutionDir)libs\v8-$(V8Version)\build\$(Configuration)\lib;%(AdditionalLibraryDirectories) - icui18n.lib;icuuc.lib;v8.lib;v8_libplatform.lib;%(AdditionalDependencies) + $(SolutionDir)libs\v8-$(V8Version)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + v8.dll.lib;v8_libbase.dll.lib;v8_libplatform.dll.lib;%(AdditionalDependencies)