diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index d87ceafff..e1abc2ecc 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -719,6 +719,11 @@ if(WITH_MAGNUMINFO) install(FILES magnum-info-nacl.html DESTINATION ${MAGNUM_DATA_INSTALL_DIR} RENAME magnum-info.html) install(FILES magnum-info-nacl.nmf DESTINATION ${MAGNUM_DATA_INSTALL_DIR} RENAME magnum-info.nmf) list(APPEND MagnumPlatform_FILES magnum-info-nacl.html magnum-info-nacl.nmf) + elseif(CORRADE_TARGET_IOS) + set_target_properties(magnum-info PROPERTIES + MACOSX_BUNDLE ON + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in + XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES") endif() # Magnum info target alias for superprojects diff --git a/src/Magnum/Platform/MacOSXBundleInfo.plist.in b/src/Magnum/Platform/MacOSXBundleInfo.plist.in new file mode 100644 index 000000000..eaac87c6a --- /dev/null +++ b/src/Magnum/Platform/MacOSXBundleInfo.plist.in @@ -0,0 +1,25 @@ + + + + + CFBundleDevelopmentRegion + en-US + CFBundleExecutable + ${MACOSX_BUNDLE_EXECUTABLE_NAME} + CFBundleIdentifier + cz.mosra.magnum.magnum-info + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + magnum-info + CFBundlePackageType + APPL + + UIRequiredDeviceCapabilities + + opengles-2 + + NSHighResolutionCapable + + + diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index 067de69c1..47c1f5d7b 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -154,7 +154,13 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat * @todo Make this work in NaCl, somehow the arguments aren't passed to * constructor but to Init() or whatnot */ - #ifndef CORRADE_TARGET_NACL + #ifdef CORRADE_TARGET_IOS + { + static_cast(arguments); + const char* iosArguments[] = { "", "--limits" }; + args.parse(2, iosArguments); + } + #elif !defined(CORRADE_TARGET_NACL) args.parse(arguments.argc, arguments.argv); #endif @@ -175,6 +181,8 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat Debug() << "Used application: Platform::WindowlessEglApplication"; #elif defined(MAGNUM_WINDOWLESSNACLAPPLICATION_MAIN) Debug() << "Used application: Platform::WindowlessNaClApplication"; + #elif defined(MAGNUM_WINDOWLESSIOSAPPLICATION_MAIN) + Debug() << "Used application: Platform::WindowlessIosApplication"; #elif defined(MAGNUM_WINDOWLESSCGLAPPLICATION_MAIN) Debug() << "Used application: Platform::WindowlessCglApplication"; #elif defined(MAGNUM_WINDOWLESSGLXAPPLICATION_MAIN)