7 files changed, 83 insertions, 12 deletions

diff --git a/project/cmake/scripts/ios/archsetup.cmake b/project/cmake/scripts/ios/ArchSetup.cmake
index e6639f7..56661e2 100644
--- a/project/cmake/scripts/ios/archsetup.cmake
+++ b/project/cmake/scripts/ios/ArchSetup.cmake
@@ -12,10 +12,9 @@ set(CMAKE_SYSTEM_NAME Darwin)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
 else()
-  if(CPU STREQUAL armv7)
-    set(ARCH arm-apple-darwin)
-  elseif(CPU STREQUAL arm64)
-    set(ARCH arm-apple-darwin)
+  if(CPU STREQUAL armv7 OR CPU STREQUAL arm64)
+    set(ARCH arm-osx)
+    set(NEON False)
   else()
     message(SEND_ERROR "Unknown CPU: ${CPU}")
   endif()
@@ -30,9 +29,8 @@ list(APPEND DEPLIBS "-framework CoreFoundation" "-framework CoreVideo"
                     "-framework QuartzCore" "-framework MediaPlayer"
                     "-framework CFNetwork" "-framework CoreGraphics"
                     "-framework Foundation" "-framework UIKit"
-                    "-framework CoreMedia" "-framework AVFoundation")
+                    "-framework CoreMedia" "-framework AVFoundation"
+                    "-framework VideoToolbox")
 
-set(ENABLE_DVDCSS OFF)
-set(ENABLE_OPTICAL OFF)
-set(ENABLE_VTB ON)
-set(VTB_FOUND 1 CACHE INTERNAL "VTB")
+set(ENABLE_DVDCSS OFF CACHE BOOL "" FORCE)
+set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
diff --git a/project/cmake/scripts/ios/Install.cmake b/project/cmake/scripts/ios/Install.cmake
new file mode 100644
index 0000000..052565f
--- /dev/null
+++ b/project/cmake/scripts/ios/Install.cmake
@@ -0,0 +1,74 @@
+# IOS packaging
+
+set(PACKAGE_OUTPUT_DIR ${CMAKE_BINARY_DIR}/build/${CORE_BUILD_CONFIG}-iphoneos)
+
+file(MAKE_DIRECTORY ${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app)
+set(BUNDLE_RESOURCES xbmc/platform/darwin/ios/Default-568h@2x.png
+                     xbmc/platform/darwin/ios/Default-667h@2x.png
+                     xbmc/platform/darwin/ios/Default-736h@3x.png
+                     xbmc/platform/darwin/ios/Default-Landscape-736h@3x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png
+                     tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png)
+
+foreach(resource IN LISTS BUNDLE_RESOURCES)
+  configure_file(${CORE_SOURCE_DIR}/${resource} ${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app COPYONLY)
+endforeach()
+configure_file(${CORE_SOURCE_DIR}/xbmc/platform/darwin/ios/English.lproj/InfoPlist.strings
+               ${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app/English.lproj/InfoPlist.strings COPYONLY)
+
+configure_file(${CORE_SOURCE_DIR}/xbmc/platform/darwin/ios/Info.plist.in
+               ${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app/Info.plist @ONLY)
+
+add_custom_target(bundle
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}> ${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app/${APP_NAME}.bin
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/DllPaths_generated.h
+                                     ${CMAKE_BINARY_DIR}/xbmc/DllPaths_generated.h
+    COMMAND "ACTION=build"
+            "TARGET_BUILD_DIR=${PACKAGE_OUTPUT_DIR}"
+            "TARGET_NAME=${APP_NAME}.app"
+            "APP_NAME=${APP_NAME}"
+            "PRODUCT_NAME=${APP_NAME}"
+            "WRAPPER_EXTENSION=app"
+            "SRCROOT=${CMAKE_BINARY_DIR}"
+            ${CORE_SOURCE_DIR}/tools/darwin/Support/CopyRootFiles-ios.command
+    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
+            "TARGET_BUILD_DIR=${PACKAGE_OUTPUT_DIR}"
+            "TARGET_NAME=${APP_NAME}.app"
+            "APP_NAME=${APP_NAME}"
+            "PRODUCT_NAME=${APP_NAME}"
+            "FULL_PRODUCT_NAME=${APP_NAME}.app"
+            "WRAPPER_EXTENSION=app"
+            "SRCROOT=${CMAKE_BINARY_DIR}"
+            ${CORE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-ios.command)
+add_dependencies(bundle ${APP_NAME_LC})
+
+set(DEPENDS_ROOT_FOR_XCODE ${NATIVEPREFIX}/..)
+configure_file(${CORE_SOURCE_DIR}/tools/darwin/packaging/ios/mkdeb-ios.sh.in
+               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/ios/mkdeb-ios.sh @ONLY)
+configure_file(${CORE_SOURCE_DIR}/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
+               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/migrate_to_kodi_ios.sh @ONLY)
+
+add_custom_target(deb
+    COMMAND "XBMC_DEPENDS_ROOT=${NATIVEPREFIX}/.."
+            "PLATFORM_NAME=${PLATFORM}"
+            "CODESIGNING_FOLDER_PATH=${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app"
+            "BUILT_PRODUCTS_DIR=${PACKAGE_OUTPUT_DIR}"
+            "WRAPPER_NAME=${APP_NAME}.app"
+            "APP_NAME=${APP_NAME}"
+            "CODE_SIGN_IDENTITY=\"\""
+            ${CORE_SOURCE_DIR}/tools/darwin/Support/Codesign.command
+    COMMAND sh ./mkdeb-ios.sh ${CORE_BUILD_CONFIG}
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/ios)
+add_dependencies(deb bundle)
diff --git a/project/cmake/scripts/ios/Macros.cmake b/project/cmake/scripts/ios/Macros.cmake
new file mode 120000
index 0000000..54c1b28
--- /dev/null
+++ b/project/cmake/scripts/ios/Macros.cmake
@@ -0,0 +1 @@
+../osx/Macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/ios/PathSetup.cmake b/project/cmake/scripts/ios/PathSetup.cmake
new file mode 120000
index 0000000..d7f25b2
--- /dev/null
+++ b/project/cmake/scripts/ios/PathSetup.cmake
@@ -0,0 +1 @@
+../osx/PathSetup.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/ios/install.cmake b/project/cmake/scripts/ios/install.cmake
deleted file mode 120000
index 0ea6586..0000000
--- a/project/cmake/scripts/ios/install.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../darwin/install.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/ios/macros.cmake b/project/cmake/scripts/ios/macros.cmake
deleted file mode 120000
index 45c7ad1..0000000
--- a/project/cmake/scripts/ios/macros.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../darwin/macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/ios/pathsetup.cmake b/project/cmake/scripts/ios/pathsetup.cmake
deleted file mode 120000
index f8e1248..0000000
--- a/project/cmake/scripts/ios/pathsetup.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../darwin/pathsetup.cmake
\ No newline at end of file