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

fixed creation of frameworks and a minor error in xcode 4 template script

Browse Source
This commit is contained in:
Marco Antognini 2011-09-08 12:03:09 +02:00
parent dad362bf69
commit c942e576c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Macros.cmake
View File

@ -148,13 +148,13 @@ macro(sfml_add_library target)
MACOSX_FRAMEWORK_IDENTIFIER org.sfml-dev.${target} MACOSX_FRAMEWORK_IDENTIFIER org.sfml-dev.${target}
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
else() endif()
# adapt install directory to allow distributing dylibs in user’s frameworks
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks
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 "@executable_path/../Frameworks")
endif() endif()
endif()
# link the target to its external dependencies # link the target to its external dependencies
if(THIS_EXTERNAL_LIBS) if(THIS_EXTERNAL_LIBS)

2
xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist vendored
View File

@ -679,7 +679,7 @@ require () # $1 is a SFML module like 'system' or 'audio'
# clean potentially old stuff # clean potentially old stuff
rm -f $dest/libsfml-$1.2.dylib rm -f $dest/libsfml-$1.2.dylib
rm -f $dest/libsfml-$1-d.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 # copy SFML libraries
if [ $frameworks ] if [ $frameworks ]