ImageDecoder: Port to Windows

This commit is contained in:
stasoid 2024-12-17 09:26:22 +05:00 committed by Andrew Kaster
commit 778947213b
Notes: github-actions[bot] 2025-02-14 16:40:05 +00:00
3 changed files with 5 additions and 3 deletions

View file

@ -7,5 +7,7 @@ serenity_lib(LibThreading threading)
target_link_libraries(LibThreading PRIVATE LibCore) target_link_libraries(LibThreading PRIVATE LibCore)
if (WIN32) if (WIN32)
find_package(pthread REQUIRED)
target_include_directories(LibThreading PUBLIC $<BUILD_INTERFACE:${PTHREAD_INCLUDE_DIR}>)
target_link_libraries(LibThreading PUBLIC ${PTHREAD_LIBRARY}) target_link_libraries(LibThreading PUBLIC ${PTHREAD_LIBRARY})
endif() endif()

View file

@ -21,5 +21,5 @@ add_executable(ImageDecoder main.cpp)
target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..) target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/) target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain) target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain LibThreading)
target_link_libraries(imagedecoderservice PRIVATE LibCore LibGfx LibIPC LibImageDecoderClient LibMain LibThreading) target_link_libraries(imagedecoderservice PRIVATE LibCore LibGfx LibIPC LibImageDecoderClient LibMain LibThreading)

View file

@ -57,8 +57,8 @@ ErrorOr<IPC::File> ConnectionFromClient::connect_new_client()
auto client_socket_or_error = Core::LocalSocket::adopt_fd(socket_fds[0]); auto client_socket_or_error = Core::LocalSocket::adopt_fd(socket_fds[0]);
if (client_socket_or_error.is_error()) { if (client_socket_or_error.is_error()) {
close(socket_fds[0]); (void)Core::System::close(socket_fds[0]);
close(socket_fds[1]); (void)Core::System::close(socket_fds[1]);
return client_socket_or_error.release_error(); return client_socket_or_error.release_error();
} }