80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2647 from cold-brewed/macos-dylib-fix

Browse Source 
macOS: Fix dynamic loading of bundled libraries
This commit is contained in:
Miran Grča
2022-08-27 17:41:05 +02:00
committed by GitHub
parent a12bf85a36 5384eb35bb
commit ea5a3466b9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/printer/prt_escp.c
View File

@@ -90,7 +90,7 @@
#ifdef _WIN32 #ifdef _WIN32
# define PATH_FREETYPE_DLL "freetype.dll" # define PATH_FREETYPE_DLL "freetype.dll"
#elif defined __APPLE__ #elif defined __APPLE__
# define PATH_FREETYPE_DLL "libfreetype.dylib" # define PATH_FREETYPE_DLL "libfreetype.6.dylib"
#else #else
# define PATH_FREETYPE_DLL "libfreetype.so.6" # define PATH_FREETYPE_DLL "libfreetype.so.6"
#endif #endif

6
src/qt/CMakeLists.txt
View File

@@ -309,7 +309,11 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
install(CODE " install(CODE "
include(BundleUtilities) include(BundleUtilities)
get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX} ABSOLUTE) get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX} ABSOLUTE)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"${QT_PLUGINS}\" \"${DIRS}\")") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"${QT_PLUGINS}\" \"${DIRS}\")
execute_process(
COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath \"@executable_path/../Frameworks/\"
\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/${INSTALL_RUNTIME_DIR}/86Box\")
")
endif() endif()
if (UNIX AND NOT APPLE AND NOT HAIKU) if (UNIX AND NOT APPLE AND NOT HAIKU)