diff --git a/CMakeLists.txt b/CMakeLists.txt index 969779f00..011625aab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,7 @@ else() # NOTE: it's not required to link agains SFML.framework set_target_properties(SFML PROPERTIES BUILD_WITH_INSTALL_RPATH 1 - INSTALL_NAME_DIR "@executable_path/../Frameworks") + INSTALL_NAME_DIR "@rpath") # install rule install(TARGETS SFML diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 5e09a3cb4..01a1f1da8 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake @@ -84,7 +84,7 @@ macro(sfml_add_library target) # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle set_target_properties(${target} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 - INSTALL_NAME_DIR "@executable_path/../Frameworks") + INSTALL_NAME_DIR "@rpath") endif() # enable automatic reference counting on iOS diff --git a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype index 5a62814ac..831e8c418 100755 Binary files a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype and b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype differ diff --git a/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile b/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile index 97defcc6a..f71a8532b 100755 Binary files a/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile and b/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile differ diff --git a/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist index b3c3560ac..fa13061db 100644 --- a/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist +++ b/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist @@ -127,6 +127,9 @@ subject to the following restrictions: INFOPLIST_FILE ___PACKAGENAME___/___PACKAGENAME___-Info.plist + + LD_RUNPATH_SEARCH_PATHS + @loader_path/../Frameworks