80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Disable tinyglib for Qt builds on Linux/BSD

Browse Source
This commit is contained in:
David Hrdlička
2022-03-06 14:46:12 +01:00
parent 9687d17d6b
commit 47211f43e9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/slirp/CMakeLists.txt
View File

@@ -21,14 +21,19 @@ if(WIN32)
target_link_libraries(slirp wsock32 iphlpapi) target_link_libraries(slirp wsock32 iphlpapi)
endif() endif()
option(SLIRP_GLIB "Use GLib proper with SLiRP" OFF) # tinyglib conflicts with the real GLib used by Qt, let's just be safe
if(QT AND UNIX AND NOT APPLE)
set(SLIRP_TINYGLIB OFF)
endif()
if(SLIRP_GLIB) option(SLIRP_TINYGLIB "Use a minimal GLib stub (`tinyglib`) with SLiRP" ON)
if(SLIRP_TINYGLIB)
target_sources(slirp PRIVATE tinyglib.c)
else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
target_link_libraries(slirp PkgConfig::GLIB) target_link_libraries(slirp PkgConfig::GLIB)
target_compile_definitions(slirp PRIVATE TINYGLIB_USE_GLIB) target_compile_definitions(slirp PRIVATE TINYGLIB_USE_GLIB)
else()
target_sources(slirp PRIVATE tinyglib.c)
endif() endif()