Revert slirp dynamic/static check, and make it not use dllimport/export

when building statically
OverdueWeevil2 · May 15, 2024 · cfc49eb · cfc49eb
1 parent d21bc64
commit cfc49eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/frontend/libslirp/CMakeLists.txt b/src/frontend/libslirp/CMakeLists.txt
@@ -46,11 +46,8 @@ set(SOURCES
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/libslirp-version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/libslirp-version.h")
 
-if (BUILD_STATIC)
-	add_library(slirp STATIC ${SOURCES})
-else()
-	add_library(slirp ${SOURCES})
-endif()
+add_library(slirp STATIC ${SOURCES})
+target_compile_definitions(slirp PRIVATE LIBSLIRP_STATIC_BUILD)
 
 target_include_directories(slirp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/glib")
 target_include_directories(slirp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")

diff --git a/src/frontend/libslirp/src/libslirp.h b/src/frontend/libslirp/src/libslirp.h
@@ -12,10 +12,14 @@
 #include <in6addr.h>
 #include <basetsd.h>
 typedef SSIZE_T slirp_ssize_t;
-#ifdef BUILDING_LIBSLIRP
-# define SLIRP_EXPORT __declspec(dllexport)
+#ifndef LIBSLIRP_STATIC_BUILD
+# ifdef BUILDING_LIBSLIRP
+#  define SLIRP_EXPORT __declspec(dllexport)
+# else
+#  define SLIRP_EXPORT __declspec(dllimport)
+# endif
 #else
-# define SLIRP_EXPORT __declspec(dllimport)
+# define SLIRP_EXPORT
 #endif
 #else
 #include <sys/types.h>