mirror of
https://github.com/jfdelnero/HxCFloppyEmulator.git
synced 2026-07-28 04:06:36 +00:00
Fix macOS dynamic libraries loading for better CAPSImage + CLI relocation support
This commit is contained in:
@@ -73,8 +73,11 @@ endif
|
||||
ifeq ($(TARGET), Darwin)
|
||||
MACOSX_ARCH ?= -arch arm64 -arch x86_64
|
||||
MACOSX_MIN_VER ?= 10.9
|
||||
# Search paths for other dylibs (like CAPSImage)
|
||||
# @loader_path = same directory as this lib.
|
||||
RPATHS = -Wl,-rpath,@loader_path,-rpath,/Library/Frameworks,-rpath,/usr/local/lib
|
||||
CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
|
||||
LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
|
||||
LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @rpath/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER} ${RPATHS}
|
||||
EXEC = libhxcfe.dylib
|
||||
endif
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ HXCFE* hxcfe_init(void)
|
||||
#if defined(WIN32)
|
||||
hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME CAPSImg.dll" );
|
||||
#elif __APPLE__
|
||||
hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME CAPSImage.framework/CAPSImage,CAPSImg.framework/CAPSImg" );
|
||||
hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME @rpath/CAPSImage.framework/CAPSImage,@rpath/CAPSImg.framework/CAPSImg" );
|
||||
#else
|
||||
hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME libcapsimage.so.5,libcapsimage.so.5.1,libcapsimage.so" );
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user