From cfe06ea1b64c315d54e777fb5d482379c229d603 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Thu, 6 Feb 2025 12:03:20 +0100
Subject: [PATCH] build: Statically link libpl again everywhere

---
 cmake/build_helpers.cmake       | 6 +-----
 cmake/modules/ImHexPlugin.cmake | 5 -----
 lib/external/pattern_language   | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index 7adc13ab3..a554fe42b 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -801,11 +801,7 @@ macro(addBundledLibraries)
     set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF CACHE BOOL "" FORCE)
     set(LIBPL_ENABLE_PRECOMPILED_HEADERS ${IMHEX_ENABLE_PRECOMPILED_HEADERS} CACHE BOOL "" FORCE)
 
-    if (WIN32 AND NOT MSVC)
-        set(LIBPL_SHARED_LIBRARY ON CACHE BOOL "" FORCE)
-    else()
-        set(LIBPL_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
-    endif()
+    set(LIBPL_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
 
     add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
     add_subdirectory(${EXTERNAL_LIBS_FOLDER}/disassembler EXCLUDE_FROM_ALL)
diff --git a/cmake/modules/ImHexPlugin.cmake b/cmake/modules/ImHexPlugin.cmake
index 26d6af434..73e14bc59 100644
--- a/cmake/modules/ImHexPlugin.cmake
+++ b/cmake/modules/ImHexPlugin.cmake
@@ -66,11 +66,6 @@ macro(add_imhex_plugin)
             SUFFIX ${IMHEX_PLUGIN_SUFFIX}
     )
 
-    # Link plugins against libpl if it's a shared library
-    if (IMHEX_EXTERNAL_PLUGIN_BUILD)
-        target_link_libraries(${IMHEX_PLUGIN_NAME} PRIVATE libpl)
-    endif ()
-
     # Set rpath of plugin libraries to the plugins folder
     if (WIN32)
         if (IMHEX_PLUGIN_LIBRARY_PLUGIN)
diff --git a/lib/external/pattern_language b/lib/external/pattern_language
index 4bdef44ea..17adb10af 160000
--- a/lib/external/pattern_language
+++ b/lib/external/pattern_language
@@ -1 +1 @@
-Subproject commit 4bdef44ea6aa780ee494f69693156ccf7cf5584d
+Subproject commit 17adb10afca651bce61289bbfc4348242ec76da6