Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-15 01:52:40 +01:00
Code Releases Wiki Activity

build: Statically link libpl again everywhere

Browse Source
This commit is contained in:
WerWolv 2025-02-06 12:03:20 +01:00
parent ca5c3e0e94
commit cfe06ea1b6
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/build_helpers.cmake
View File

@ -801,11 +801,7 @@ macro(addBundledLibraries)
set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF CACHE BOOL "" FORCE) set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF CACHE BOOL "" FORCE)
set(LIBPL_ENABLE_PRECOMPILED_HEADERS ${IMHEX_ENABLE_PRECOMPILED_HEADERS} CACHE BOOL "" FORCE) set(LIBPL_ENABLE_PRECOMPILED_HEADERS ${IMHEX_ENABLE_PRECOMPILED_HEADERS} CACHE BOOL "" FORCE)
if (WIN32 AND NOT MSVC) set(LIBPL_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
set(LIBPL_SHARED_LIBRARY ON CACHE BOOL "" FORCE)
else()
set(LIBPL_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
endif()
add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL) add_subdirectory(${EXTERNAL_LIBS_FOLDER}/pattern_language EXCLUDE_FROM_ALL)
add_subdirectory(${EXTERNAL_LIBS_FOLDER}/disassembler EXCLUDE_FROM_ALL) add_subdirectory(${EXTERNAL_LIBS_FOLDER}/disassembler EXCLUDE_FROM_ALL)

5
cmake/modules/ImHexPlugin.cmake
View File

@ -66,11 +66,6 @@ macro(add_imhex_plugin)
SUFFIX ${IMHEX_PLUGIN_SUFFIX} 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 # Set rpath of plugin libraries to the plugins folder
if (WIN32) if (WIN32)
if (IMHEX_PLUGIN_LIBRARY_PLUGIN) if (IMHEX_PLUGIN_LIBRARY_PLUGIN)

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit 4bdef44ea6aa780ee494f69693156ccf7cf5584d Subproject commit 17adb10afca651bce61289bbfc4348242ec76da6