diff options
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 10 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj.filters | 18 |
5 files changed, 17 insertions, 17 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 814fa36b76e..4ad405af6a6 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -578,7 +578,7 @@ class MachCommands(CommandBase): call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], verbose=verbose) # on msvc, we need to copy in some DLLs in to the servo.exe dir - for ssl_lib in ["libeay32.dll", "ssleay32.dll"]: + for ssl_lib in ["libssl.dll", "libcrypto.dll"]: shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib), servo_exe_dir) # Search for the generated nspr4.dll diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 57e729dc92c..e8807397034 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -610,7 +610,7 @@ install them, let us know by filing a bug!") # Link openssl env["OPENSSL_INCLUDE_DIR"] = path.join(openssl_base_dir, "include") env["OPENSSL_LIB_DIR"] = path.join(openssl_base_dir, "lib") - env["OPENSSL_LIBS"] = "libeay32:ssleay32" + env["OPENSSL_LIBS"] = "libssl:libcrypto" # Link moztools, used for building SpiderMonkey env["MOZTOOLS_PATH"] = os.pathsep.join([ path.join(package_dir("moztools"), "bin"), diff --git a/python/servo/packages.py b/python/servo/packages.py index 3e7e3ccf67c..2d10156ad22 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -7,5 +7,5 @@ WINDOWS_MSVC = { "llvm": "8.0.0", "moztools": "3.2", "ninja": "1.7.1", - "openssl": "1.0.2q-vs2017", + "openssl": "111.3.0+1.1.1c-vs2017", } diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index fcfb8e67c13..730966d8b7e 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -297,7 +297,7 @@ <None Include="..\..\..\target\debug\intl-8.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\target\debug\libeay32.dll"> + <None Include="..\..\..\target\debug\libssl.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> <None Include="..\..\..\target\debug\libwinpthread-1.dll"> @@ -312,7 +312,7 @@ <None Include="..\..\..\target\debug\simpleservo.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\target\debug\ssleay32.dll"> + <None Include="..\..\..\target\debug\libcrypto.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> <None Include="..\..\..\target\debug\swresample-3.dll"> @@ -468,7 +468,7 @@ <None Include="..\..\..\target\release\intl-8.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\target\release\libeay32.dll"> + <None Include="..\..\..\target\release\libssl.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> <None Include="..\..\..\target\release\libwinpthread-1.dll"> @@ -483,7 +483,7 @@ <None Include="..\..\..\target\release\simpleservo.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\target\release\ssleay32.dll"> + <None Include="..\..\..\target\release\libcrypto.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> <None Include="..\..\..\target\release\swresample-3.dll"> @@ -571,4 +571,4 @@ <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" /> <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.2.1.13\build\native\ANGLE.WindowsStore.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.2.1.13\build\native\ANGLE.WindowsStore.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index 604bb785585..69823c7f0fa 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -234,7 +234,10 @@ <None Include="..\..\..\target\debug\intl-8.dll"> <Filter>DebugServoDLLs</Filter> </None> - <None Include="..\..\..\target\debug\libeay32.dll"> + <None Include="..\..\..\target\debug\libcrypto.dll"> + <Filter>DebugServoDLLs</Filter> + </None> + <None Include="..\..\..\target\debug\libssl.dll"> <Filter>DebugServoDLLs</Filter> </None> <None Include="..\..\..\target\debug\libwinpthread-1.dll"> @@ -246,9 +249,6 @@ <None Include="..\..\..\target\debug\orc-0.4-0.dll"> <Filter>DebugServoDLLs</Filter> </None> - <None Include="..\..\..\target\debug\ssleay32.dll"> - <Filter>DebugServoDLLs</Filter> - </None> <None Include="..\..\..\target\debug\swresample-3.dll"> <Filter>DebugServoDLLs</Filter> </None> @@ -267,9 +267,6 @@ <None Include="..\..\..\target\release\swresample-3.dll"> <Filter>ReleaseServoDLLs</Filter> </None> - <None Include="..\..\..\target\release\ssleay32.dll"> - <Filter>ReleaseServoDLLs</Filter> - </None> <None Include="..\..\..\target\release\simpleservo.dll"> <Filter>ReleaseServoDLLs</Filter> </None> @@ -282,7 +279,10 @@ <None Include="..\..\..\target\release\libwinpthread-1.dll"> <Filter>ReleaseServoDLLs</Filter> </None> - <None Include="..\..\..\target\release\libeay32.dll"> + <None Include="..\..\..\target\release\libssl.dll"> + <Filter>ReleaseServoDLLs</Filter> + </None> + <None Include="..\..\..\target\release\libcrypto.dll"> <Filter>ReleaseServoDLLs</Filter> </None> <None Include="..\..\..\target\release\intl-8.dll"> @@ -473,4 +473,4 @@ <ItemGroup> <ApplicationDefinition Include="App.xaml" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |