From e33cbb401890c542c744d62f9fd91471e24f0e54 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 15 May 2024 15:54:08 +0200 Subject: [PATCH] fix slirp includes This accidentally worked locally because I had it installed Also explains the weird error I got about struct sizes being different... --- src/frontend/libslirp/CMakeLists.txt | 6 ++---- src/frontend/qt_sdl/LAN_Socket.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/frontend/libslirp/CMakeLists.txt b/src/frontend/libslirp/CMakeLists.txt index 7ece5b3d..6b9f5788 100644 --- a/src/frontend/libslirp/CMakeLists.txt +++ b/src/frontend/libslirp/CMakeLists.txt @@ -49,11 +49,9 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/libslirp-version.h.in" "${CMAKE_ add_library(slirp STATIC ${SOURCES}) target_include_directories(slirp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/glib") target_include_directories(slirp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") -target_include_directories(slirp PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") +target_include_directories(slirp PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") target_compile_definitions(slirp PRIVATE BUILDING_LIBSLIRP) -set_target_properties(slirp PROPERTIES INTERPROCEDURAL_OPTIMIZATION OFF) -set_target_properties(slirp PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF) if (WIN32) target_link_libraries(slirp PRIVATE ws2_32 iphlpapi) @@ -61,4 +59,4 @@ elseif(HAIKU) target_Link_libraries(slirp PRIVATE network) elseif(APPLE) target_link_libraries(slirp PRIVATE resolv) -endif() \ No newline at end of file +endif() diff --git a/src/frontend/qt_sdl/LAN_Socket.cpp b/src/frontend/qt_sdl/LAN_Socket.cpp index e938af80..df0d754b 100644 --- a/src/frontend/qt_sdl/LAN_Socket.cpp +++ b/src/frontend/qt_sdl/LAN_Socket.cpp @@ -26,7 +26,7 @@ #include "FIFO.h" #include "Platform.h" -#include +#include #ifdef __WIN32__ #include