From d8fdddcc3f96eaaf3216b65e36b940b0bbcb7d10 Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 15 Nov 2024 14:14:15 +0000 Subject: switch to ubuntu:24.04 add POLYSEED_STATIC to toolchain.cmake.in in order to properly link drop patches --- contrib/depends/packages/polyseed.mk | 5 ----- .../patches/polyseed/force-static-mingw.patch | 23 ---------------------- contrib/depends/toolchain.cmake.in | 2 ++ 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 contrib/depends/patches/polyseed/force-static-mingw.patch (limited to 'contrib') diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk index 881e356..3c0e9c5 100644 --- a/contrib/depends/packages/polyseed.mk +++ b/contrib/depends/packages/polyseed.mk @@ -4,11 +4,6 @@ $(package)_download_path=https://github.com/MrCyjaneK/$(package)/archive/refs/ta $(package)_download_file=v$($(package)_version).tar.gz $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=7f5c583a1f48ee6d63174dd1f1485d00b02d76d6df0181bc42c54558502c8443 -$(package)_patches=force-static-mingw.patch - -define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch -endef define $(package)_config_cmds CC="$($(package)_cc)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DSTATIC=ON . diff --git a/contrib/depends/patches/polyseed/force-static-mingw.patch b/contrib/depends/patches/polyseed/force-static-mingw.patch deleted file mode 100644 index f05cb2b..0000000 --- a/contrib/depends/patches/polyseed/force-static-mingw.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/include/polyseed.h -+++ b/include/polyseed.h -@@ -93,13 +93,13 @@ Shared/static library definitions - - define POLYSEED_STATIC when linking to the static library - */ - #if defined(_WIN32) || defined(__CYGWIN__) -- #ifdef POLYSEED_SHARED -- #define POLYSEED_API __declspec(dllexport) -- #elif !defined(POLYSEED_STATIC) -- #define POLYSEED_API __declspec(dllimport) -- #else -- #define POLYSEED_API -- #endif -+// #ifdef POLYSEED_SHARED -+// #define POLYSEED_API __declspec(dllexport) -+// #elif !defined(POLYSEED_STATIC) -+// #define POLYSEED_API __declspec(dllimport) -+// #else -+ #define POLYSEED_API -+// #endif - #define POLYSEED_PRIVATE - #else - #ifdef POLYSEED_SHARED diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index e063cb9..772c8a6 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -174,5 +174,7 @@ endif() link_directories(@prefix@/lib) +add_definitions(-DPOLYSEED_STATIC=ON) + #Create a new global cmake flag that indicates building with depends set (DEPENDS true) -- cgit v1.2.3