Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/rpath_osx'

Browse Source
This commit is contained in:
Lukas Dürrenberger 2014-10-09 09:11:23 +02:00
commit c348171f24
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -232,7 +232,7 @@ else()
# NOTE: it's not required to link agains SFML.framework # NOTE: it's not required to link agains SFML.framework
set_target_properties(SFML PROPERTIES set_target_properties(SFML PROPERTIES
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path/../Frameworks") INSTALL_NAME_DIR "@rpath")
# install rule # install rule
install(TARGETS SFML install(TARGETS SFML

2
cmake/Macros.cmake
View File

@ -84,7 +84,7 @@ macro(sfml_add_library target)
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@executable_path/../Frameworks") INSTALL_NAME_DIR "@rpath")
endif() endif()
# enable automatic reference counting on iOS # enable automatic reference counting on iOS

BIN
extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype
View File

Binary file not shown.

BIN
extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile
View File

Binary file not shown.

3
tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist vendored
View File

@ -127,6 +127,9 @@ subject to the following restrictions:
<dict> <dict>
<key>INFOPLIST_FILE</key> <key>INFOPLIST_FILE</key>
<string>___PACKAGENAME___/___PACKAGENAME___-Info.plist</string> <string>___PACKAGENAME___/___PACKAGENAME___-Info.plist</string>
<key>LD_RUNPATH_SEARCH_PATHS</key>
<string>@loader_path/../Frameworks</string>
</dict> </dict>
</dict> </dict>
</array> </array>