mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
fixed creation of frameworks and a minor error in xcode 4 template script
This commit is contained in:
parent
dad362bf69
commit
c942e576c1
@ -148,13 +148,13 @@ macro(sfml_add_library target)
|
||||
MACOSX_FRAMEWORK_IDENTIFIER org.sfml-dev.${target}
|
||||
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
|
||||
MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
|
||||
else()
|
||||
# adapt install directory to allow distributing dylibs in user’s frameworks
|
||||
endif()
|
||||
|
||||
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks
|
||||
set_target_properties(${target} PROPERTIES
|
||||
BUILD_WITH_INSTALL_RPATH 1
|
||||
INSTALL_NAME_DIR "@executable_path/../Frameworks")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# link the target to its external dependencies
|
||||
if(THIS_EXTERNAL_LIBS)
|
||||
|
@ -679,7 +679,7 @@ require () # $1 is a SFML module like 'system' or 'audio'
|
||||
# clean potentially old stuff
|
||||
rm -f $dest/libsfml-$1.2.dylib
|
||||
rm -f $dest/libsfml-$1-d.2.dylib
|
||||
rm -f $dest/sfml-$1.framework
|
||||
rm -fr $dest/sfml-$1.framework
|
||||
|
||||
# copy SFML libraries
|
||||
if [ $frameworks ]
|
||||
|
Loading…
Reference in New Issue
Block a user