[Scummvm-git-logs] scummvm master -> 7ac78c9172e4f0a965f2bf0b316dfb84eb4ff3c6

[antoniou79]

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:
7ac78c9172 CONFIGURE: Fix Raspberry Pi cross compilation using the Pro toolchain


Commit: 7ac78c9172e4f0a965f2bf0b316dfb84eb4ff3c6
    https://github.com/scummvm/scummvm/commit/7ac78c9172e4f0a965f2bf0b316dfb84eb4ff3c6
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-04-06T04:59:17+03:00

Commit Message:
CONFIGURE: Fix Raspberry Pi cross compilation using the Pro toolchain

https://github.com/Pro/raspi-toolchain

Current release of this toolchain must be installed in /opt
This uses a more recent gcc (8) whereas the official one uses 4.3-2

Changed paths:
    configure


diff --git a/configure b/configure
index 6f6cb1966d..4262820e6b 100755
--- a/configure
+++ b/configure
@@ -3190,11 +3190,13 @@ if test -n "$_host"; then
 			# These are needed to build against Raspbian's libSDL.
 			append_var LDFLAGS "--sysroot=$RPI_ROOT"
 			append_var LDFLAGS "-B$RPI_ROOT/usr/lib/arm-linux-gnueabihf"
+			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/usr/lib/arm-linux-gnueabihf/pulseaudio"
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/usr/lib/arm-linux-gnueabihf"
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/lib/arm-linux-gnueabihf"
 			append_var LDFLAGS "-Xlinker --rpath-link=$RPI_ROOT/opt/vc/lib"
 			append_var LDFLAGS "-L$RPI_ROOT/opt/vc/lib"
 			append_var CXXFLAGS "-isystem $RPI_ROOT/usr/include/arm-linux-gnueabihf"
+			append_var CXXFLAGS "-I$RPI_ROOT/usr/include"
 			# This is so optional OpenGL ES includes are found.
 			append_var CXXFLAGS "-I$RPI_ROOT/opt/vc/include"
 			_savegame_timestamp=no