From 8938c7ed08ce4d9eb70a6f1869d8620eee22b486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Thu, 10 Feb 2022 08:25:08 +0100 Subject: [PATCH] Revert "Use external libslirp on Unix systems except macOS" This reverts commit 3361c05efdc7319f936dfd6f7b6694b96ded970d. --- src/network/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index c01c3643b..5cfa87d91 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -16,12 +16,8 @@ add_library(net OBJECT network.c net_pcap.c net_slirp.c net_dp8390.c net_3c503.c net_ne2000.c net_pcnet.c net_wd8003.c net_plip.c) -if(NOT WIN32 AND NOT APPLE) - set(SLIRP_EXTERNAL 1) -else() - option(SLIRP_EXTERNAL "Link against the system-provided libslirp library" OFF) - mark_as_advanced(SLIRP_EXTERNAL) -endif() +option(SLIRP_EXTERNAL "Link against the system-provided libslirp library" OFF) +mark_as_advanced(SLIRP_EXTERNAL) if(SLIRP_EXTERNAL) find_package(PkgConfig REQUIRED) @@ -30,4 +26,4 @@ if(SLIRP_EXTERNAL) else() add_subdirectory(slirp) target_link_libraries(86Box slirp) -endif() +endif() \ No newline at end of file