oomer/poomer-discord
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed DPP version detection and fallback

Browse Source
This commit is contained in:
Harvey Fong 2026-01-04 03:04:48 +00:00
parent c402bf5485
commit 17b42553b2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -4,8 +4,12 @@ PLATFORM = $(shell uname)
BUILD_TYPE ?= release# Default to release build if not specified BUILD_TYPE ?= release# Default to release build if not specified
# Version configuration (can be overridden) # Version configuration (can be overridden)
ifeq ($(PLATFORM), Darwin)
DPP_VERSION ?= $(shell find ../DPP/build/library -name "libdpp.*.dylib" -type f | head -1 | sed 's/.*libdpp\.//;s/\.dylib//')
else
DPP_VERSION ?= $(shell find ../DPP/build/library -name "libdpp.so.*.*.*" -type f | head -1 | sed 's/.*libdpp\.so\.//') DPP_VERSION ?= $(shell find ../DPP/build/library -name "libdpp.so.*.*.*" -type f | head -1 | sed 's/.*libdpp\.so\.//')
DPP_VERSION := $(or $(DPP_VERSION),10.1.4)# Fallback version if auto-detection fails endif
DPP_VERSION := $(or $(DPP_VERSION),10.1.5)# Fallback version if auto-detection fails
# Common paths # Common paths
DPP_PATH = ../DPP DPP_PATH = ../DPP
@ -106,6 +110,8 @@ ifeq ($(PLATFORM), Darwin)
@install_name_tool -change ../libssl/libssl.4.dylib @executable_path/libssl.dylib $(OUTPUT_FILE); \ @install_name_tool -change ../libssl/libssl.4.dylib @executable_path/libssl.dylib $(OUTPUT_FILE); \
install_name_tool -change ../libssl/libcrypto.4.dylib @executable_path/libcrypto.dylib $(OUTPUT_FILE); \ install_name_tool -change ../libssl/libcrypto.4.dylib @executable_path/libcrypto.dylib $(OUTPUT_FILE); \
cp ../libssl/libssl.dylib ../libssl/libcrypto.dylib $(BIN_DIR)/ cp ../libssl/libssl.dylib ../libssl/libcrypto.dylib $(BIN_DIR)/
@# Fix library paths in copied OpenSSL libraries
@install_name_tool -change /usr/local/lib/libcrypto.4.dylib @executable_path/libcrypto.dylib $(BIN_DIR)/libssl.dylib
else else
@# Linux: Handle versioned libraries (follow standard convention) @# Linux: Handle versioned libraries (follow standard convention)
@if [ -f $(DPP_BUILD_DIR)/$(DPP_VERSIONED_FILE) ]; then \ @if [ -f $(DPP_BUILD_DIR)/$(DPP_VERSIONED_FILE) ]; then \
@ -162,3 +168,4 @@ cleanall:
rmdir bin 2>/dev/null || true rmdir bin 2>/dev/null || true