diff --git a/CMakeLists.txt b/CMakeLists.txt index f09b67504..c068f7207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,14 +304,30 @@ if(SFML_OS_WINDOWS) elseif(SFML_OS_MACOSX) # install extlibs dependencies only when used - if("${SNDFILE_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/sndfile.framework") - install(DIRECTORY extlibs/libs-osx/Frameworks/sndfile.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) + if("${FLAC_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/FLAC.framework") + install(DIRECTORY extlibs/libs-osx/Frameworks/FLAC.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) endif() if("${FREETYPE_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/freetype.framework") install(DIRECTORY extlibs/libs-osx/Frameworks/freetype.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) endif() + if("${OGG_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/ogg.framework") + install(DIRECTORY extlibs/libs-osx/Frameworks/ogg.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) + endif() + + if("${VORBIS_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbis.framework") + install(DIRECTORY extlibs/libs-osx/Frameworks/vorbis.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) + endif() + + if("${VORBISENC_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbisenc.framework") + install(DIRECTORY extlibs/libs-osx/Frameworks/vorbisenc.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) + endif() + + if("${VORBISFILE_LIBRARY}" STREQUAL "${SFML_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbisfile.framework") + install(DIRECTORY extlibs/libs-osx/Frameworks/vorbisfile.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX}) + endif() + # install the Xcode templates if requested if(SFML_INSTALL_XCODE_TEMPLATES) configure_file( diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/FLAC b/extlibs/libs-osx/Frameworks/FLAC.framework/FLAC new file mode 120000 index 000000000..c29cdc3ec --- /dev/null +++ b/extlibs/libs-osx/Frameworks/FLAC.framework/FLAC @@ -0,0 +1 @@ +Versions/Current/FLAC \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/Resources b/extlibs/libs-osx/Frameworks/FLAC.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/FLAC.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/FLAC b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/FLAC new file mode 100755 index 000000000..c46017956 Binary files /dev/null and b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/FLAC differ diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..d78793406 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + FLAC + CFBundleIdentifier + org.sfml-dev.FLAC + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/Current b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/FLAC.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/Resources b/extlibs/libs-osx/Frameworks/ogg.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/ogg.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..f4c05d043 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ogg + CFBundleIdentifier + org.sfml-dev.ogg + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/ogg b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/ogg new file mode 100755 index 000000000..ccfb76910 Binary files /dev/null and b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/A/ogg differ diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/Versions/Current b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/ogg.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/ogg.framework/ogg b/extlibs/libs-osx/Frameworks/ogg.framework/ogg new file mode 120000 index 000000000..aa84ee717 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/ogg.framework/ogg @@ -0,0 +1 @@ +Versions/Current/ogg \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/Resources b/extlibs/libs-osx/Frameworks/vorbis.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbis.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..819b1fc23 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + vorbis + CFBundleIdentifier + org.sfml-dev.vorbis + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/vorbis b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/vorbis new file mode 100755 index 000000000..c1d75fd6e Binary files /dev/null and b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/A/vorbis differ diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/Current b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbis.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbis.framework/vorbis b/extlibs/libs-osx/Frameworks/vorbis.framework/vorbis new file mode 120000 index 000000000..85a6d550c --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbis.framework/vorbis @@ -0,0 +1 @@ +Versions/Current/vorbis \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Resources b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..936016f5c --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + vorbisenc + CFBundleIdentifier + org.sfml-dev.vorbisenc + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/vorbisenc b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/vorbisenc new file mode 100755 index 000000000..0b0c223f3 Binary files /dev/null and b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/A/vorbisenc differ diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/Current b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisenc.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisenc.framework/vorbisenc b/extlibs/libs-osx/Frameworks/vorbisenc.framework/vorbisenc new file mode 120000 index 000000000..2311ce863 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisenc.framework/vorbisenc @@ -0,0 +1 @@ +Versions/Current/vorbisenc \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Resources b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..502683301 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + vorbisfile + CFBundleIdentifier + org.sfml-dev.vorbisfile + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/vorbisfile b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/vorbisfile new file mode 100755 index 000000000..33c4451ad Binary files /dev/null and b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/A/vorbisfile differ diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/Current b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisfile.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/extlibs/libs-osx/Frameworks/vorbisfile.framework/vorbisfile b/extlibs/libs-osx/Frameworks/vorbisfile.framework/vorbisfile new file mode 120000 index 000000000..bc277ac13 --- /dev/null +++ b/extlibs/libs-osx/Frameworks/vorbisfile.framework/vorbisfile @@ -0,0 +1 @@ +Versions/Current/vorbisfile \ No newline at end of file