From 8583fb54a8dcb82fcfccfc2900a5f34b75d3e804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sundstr=C3=B6m?= Date: Fri, 14 Apr 2023 08:26:17 +0200 Subject: [PATCH] DOCPORTAL: Update ios7 and tvos instructions This updates the instructions for building the ios7 and tvos backends using scummvm-ios7-libs-v3, utilizing the Apple XCFramework format for the pre-compiled libraries. Using scummvm-ios7-libs-v3 also enables use of the following features: - faad - gif - mikmod - mpeg2 - theoradec - vpx --- doc/docportal/other_platforms/ios.rst | 11 +++++------ doc/docportal/other_platforms/tvos.rst | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/docportal/other_platforms/ios.rst b/doc/docportal/other_platforms/ios.rst index 24909179dd2..ca860290a3f 100644 --- a/doc/docportal/other_platforms/ios.rst +++ b/doc/docportal/other_platforms/ios.rst @@ -20,7 +20,7 @@ What you'll need - A Mac computer with Xcode installed. Xcode is a free App, available from the Mac App Store. - An Apple Developer account. You can sign up for a free account on the `Apple Developer Member Center `_ with your Apple ID. -- The ScummVM `iOS Libraries `_ downloaded, and the zip file extracted. +- The ScummVM `iOS Libraries `_ downloaded, and the zip file extracted. .. note:: @@ -47,11 +47,11 @@ Create a new directory called ``build`` at the same level as the repository you mkdir build -Copy the contents of the ``scummvm-ios7-libs-v2`` folder you extracted earlier into the ``build`` directory, using either the Finder, or the command line as follows: +Move the contents of the ``scummvm-ios7-libs-v3`` folder you extracted earlier into the ``build`` directory, using either the Finder, or the command line as follows: .. code-block:: - cp -r ~/Downloads/scummvm-ios7-libs-v2/* ~/build/ + mv ~/Downloads/frameworks ~/build/ If your downloaded iOS library folder is not in the Downloads folder as it is in the preceding example, change the path to where the folder actually is. @@ -76,7 +76,7 @@ It's time to generate the Xcode project. Run the following on the command line: .. code:: - ../scummvm/devtools/create_project/xcode/build/Release/create_project ../scummvm --xcode --enable-fluidsynth --disable-nasm --disable-opengl --disable-theoradec --disable-mpeg2 --disable-taskbar --disable-tts --disable-fribidi + ../scummvm/devtools/create_project/xcode/build/Release/create_project ../scummvm --xcode --use-xcframework --enable-faad --enable-fluidsynth --enable-gif --enable-mikmod --enable-mpeg2 --enable-vpx --disable-nasm --disable-opengl --disable-taskbar --disable-tts The resulting directory structure looks like this: @@ -85,8 +85,7 @@ The resulting directory structure looks like this: Home |--scummvm '--build - |-- include - |-- lib + |-- frameworks |-- engines '-- scummvm.xcodeproj diff --git a/doc/docportal/other_platforms/tvos.rst b/doc/docportal/other_platforms/tvos.rst index 5fdab31bf81..35655153a53 100644 --- a/doc/docportal/other_platforms/tvos.rst +++ b/doc/docportal/other_platforms/tvos.rst @@ -17,7 +17,7 @@ There are two ways to install ScummVM on an Apple TV depending on if building th Building the project ************************************ -Since the port for Apple TV shares the same code base as the iOS port the instructions for building the project is the same as for iOS. Follow the :doc:`./ios` with the differences that the `tvOS libraries `_ should be used instead and the ``ScummVM-tvOS`` target should be chosen in Xcode. Use the libraries in the ``appletv`` folder if building for real target and ``appletvsimulator`` if building for simulator. Note that the libraries are built without bitcode since it's not required since tvOS 16. +Since the port for Apple TV shares the same code base as the iOS port the instructions for building the project is the same as for iOS. Follow the :doc:`./ios` with the difference that the ``ScummVM-tvOS`` target should be chosen in Xcode. Downloading and installing ScummVM ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^