Skip to content

Commit

Permalink
tests: update Win expected libs, target_link_libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
cpu committed Apr 11, 2024
1 parent 81e77da commit 575c80d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ IF(WIN32)
client
debug "${CMAKE_SOURCE_DIR}/target/debug/rustls_ffi.lib"
optimized "${CMAKE_SOURCE_DIR}/target/release/rustls_ffi.lib"
advapi32.lib credui.lib kernel32.lib secur32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib userenv.lib kernel32.lib kernel32.lib ws2_32.lib bcrypt.lib msvcrt.lib legacy_stdio_definitions.lib userenv.lib kernel32.lib msvcrt.lib ntdll.lib Synchronization.lib
advapi32.lib bcrypt.lib crypt32.lib cryptnet.lib kernel32.lib ncrypt.lib bcrypt.lib advapi32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib kernel32.lib ntdll.lib userenv.lib ws2_32.lib synchronization.lib kernel32.lib ws2_32.lib kernel32.lib msvcrt.lib
)
set_property(TARGET client PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
ENDIF(WIN32)
Expand All @@ -34,7 +34,7 @@ IF(WIN32)
server
debug "${CMAKE_SOURCE_DIR}/target/debug/rustls_ffi.lib"
optimized "${CMAKE_SOURCE_DIR}/target/release/rustls_ffi.lib"
advapi32.lib credui.lib kernel32.lib secur32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib userenv.lib kernel32.lib kernel32.lib ws2_32.lib bcrypt.lib msvcrt.lib legacy_stdio_definitions.lib userenv.lib kernel32.lib msvcrt.lib ntdll.lib Synchronization.lib
advapi32.lib bcrypt.lib crypt32.lib cryptnet.lib kernel32.lib ncrypt.lib bcrypt.lib advapi32.lib legacy_stdio_definitions.lib kernel32.lib advapi32.lib kernel32.lib ntdll.lib userenv.lib ws2_32.lib synchronization.lib kernel32.lib ws2_32.lib kernel32.lib msvcrt.lib
)
set_property(TARGET server PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
ENDIF(WIN32)
Expand Down
10 changes: 7 additions & 3 deletions tests/static_libs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,25 @@ fn expected_linker_parts() -> &'static [&'static str] {
#[cfg(target_os = "windows")]
{
&[
"advapi32.lib",
"bcrypt.lib",
"crypt32.lib",
"cryptnet.lib",
"kernel32.lib",
"ncrypt.lib",
"bcrypt.lib",
"advapi32.lib",
"legacy_stdio_definitions.lib",
"kernel32.lib",
"advapi32.lib",
"bcrypt.lib",
"kernel32.lib",
"ntdll.lib",
"userenv.lib",
"ws2_32.lib",
"synchronization.lib",
"kernel32.lib",
"ws2_32.lib",
"kernel32.lib",
"ntdll.lib",
"kernel32.lib",
"msvcrt.lib",
]
}
Expand Down

0 comments on commit 575c80d

Please sign in to comment.