[Scummvm-git-logs] scummvm master -> a8b7e1b2eebd412f5c632a3c65ab466f3d066c25

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a8b7e1b2ee 3DS: Update README.md


Commit: a8b7e1b2eebd412f5c632a3c65ab466f3d066c25
    https://github.com/scummvm/scummvm/commit/a8b7e1b2eebd412f5c632a3c65ab466f3d066c25
Author: Michael Ball (ballm4788 at gmail.com)
Date: 2021-07-05T00:57:00+02:00

Commit Message:
3DS: Update README.md

 - [`devkitpro-pkgbuild-helpers` is now deprecated in favor of `dkp-toolchain-vars`](https://github.com/devkitPro/pacman-packages/commit/f2fa9349470e7d42a4999bbea537ef9821782416#diff-1ad351cc587a0b9fc4008f8094e8935e2b4c2a3063b1e470c37c4fdeac92f105). The `devkitarm.sh` and `3dsvars.sh` files are still in `/opt/devkitpro/`.
 - Update Section 4.1.2 with values from [`devkitarm.sh`](https://github.com/devkitPro/pacman-packages/blob/master/dkp-toolchain-vars/devkitarm.sh) and [`3dsvars.sh`](https://github.com/devkitPro/pacman-packages/blob/master/dkp-toolchain-vars/3dsvars.sh)

Changed paths:
    backends/platform/3ds/README.md


diff --git a/backends/platform/3ds/README.md b/backends/platform/3ds/README.md
index f912a1528b..86df02019b 100644
--- a/backends/platform/3ds/README.md
+++ b/backends/platform/3ds/README.md
@@ -137,7 +137,8 @@ game engines will eventually be listed here.
 4.1.1) Compiling third-party libraries
 --------------------------------------
 It is strongly recommended that you use devkitPro's pacman in order to get the most recent
-portlibs for your build.
+portlibs for your build. Instructions for accessing these binaries can be found here:
+https://devkitpro.org/wiki/devkitPro_pacman
 
 The following libraries can be downloaded with pacman:
 
@@ -152,6 +153,7 @@ The following libraries can be downloaded with pacman:
 |  tremor       |  3ds-libvorbisidec    |
 |  flac         |  3ds-flac             |
 |  curl         |  3ds-curl             |
+|  libtheora    |  3ds-libtheora        |
 
 At the moment of writing, the version of `freetype2` packaged by devkitPro has an issue
 where it allocates too much data on the stack when ScummVM loads GUI themes.
@@ -164,10 +166,10 @@ be found through pacman.
 
 The following pacman packages are also recommended:
  - `3ds-dev`
- - `devkitpro-pkgbuild-helpers`
+ - `dkp-toolchain-vars`
 
-Once you have the `devkitpro-pkgbuild-helpers` package, you should be able to find
-the following scripts in your `/opt/devkitpro` folder:
+Once you have the `dkp-toolchain-vars` package, you should be able to find the following
+scripts in your `/opt/devkitpro` folder:
  - `devkitarm.sh`
  - `3dsvars.sh`
 
@@ -192,24 +194,31 @@ Most libraries used can be compiled with same commands and configuration flags.
 
 4.1.2) Manually setting up the environment
 ------------------------------------------
-In case you don't have the helpers package downloaded, you can use the following to set-up
-your environment variables.
+In case you don't have the `dkp-toolchain-vars` package downloaded, you can use the
+following to set-up your environment variables.
 
 It is assumed that you have these variables already set up. If not, then do so:
- - DEVKITPRO    Your root devkitPro directory
- - DEVKITARM    Your root devkitARM directory (probably same as $DEVKITPRO/devkitARM)
- - CTRULIB      Your root libctru directory (probably same as $DEVKITPRO/libctru)
+ - DEVKITPRO	Your root devkitPro directory (usually /opt/devkitpro)
+ - DEVKITARM	Your root devkitARM directory (probably same as $DEVKITPRO/devkitARM)
+ - CTRULIB		Your root libctru directory (probably same as $DEVKITPRO/libctru)
 
 In the source directory of the library:
 ```
  $ export PORTLIBS=$DEVKITPRO/portlibs/3ds
- $ export PATH=$DEVKITARM/bin:$PATH
+ $ export PATH=$DEVKITPRO/tools/bin:$PORTLIBS/bin:$DEVKITARM/bin:$PATH
  $ export PKG_CONFIG_PATH=$PORTLIBS/lib/pkgconfig
  $ export PKG_CONFIG_LIBDIR=$PORTLIBS/lib/pkgconfig
  $ export CFLAGS="-g -march=armv6k -mtune=mpcore -mfloat-abi=hard -O2
                     -mword-relocations -ffunction-sections -fdata-sections"
- $ export CPPFLAGS="-I$PORTLIBS/include -I$CTRULIB/include"
- $ export LDFLAGS="-L$PORTLIBS/lib"
+ $ export CXXFLAGS="$CFLAGS"
+ $ export CPPFLAGS="-D_3DS -D__3DS__ -I$PORTLIBS/include -I$CTRULIB/include"
+ $ export LDFLAGS="-L$PORTLIBS/lib -L$CTRULIB/lib"
+ $ export TOOL_PREFIX=arm-none-eabi-
+ $ export CC=${TOOL_PREFIX}gcc
+ $ export CXX=${TOOL_PREFIX}g++
+ $ export AR=${TOOL_PREFIX}gcc-ar
+ $ export RANLIB=${TOOL_PREFIX}gcc-ranlib
+ $ export LIBS="-lctru"
  ```
 
 4.2) Compiling ScummVM