[Scummvm-git-logs] scummvm master -> 366e9997c4cd31b1babe50e7c6f27ec1a695d69d

[phcoder]

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

Summary:
d671899e52 COMMON: Move -G0 to right place for psp
366e9997c4 COMMON: Fix freetype path for psp


Commit: d671899e522ff986173c3f8f11952691ccbd6e7d
    https://github.com/scummvm/scummvm/commit/d671899e522ff986173c3f8f11952691ccbd6e7d
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T22:46:35+01:00

Commit Message:
COMMON: Move -G0 to right place for psp

Changed paths:
    configure


diff --git a/configure b/configure
index 516ecfdee0..a32647ba30 100755
--- a/configure
+++ b/configure
@@ -1838,7 +1838,6 @@ psp)
 	_host_os=psp
 	_host_cpu=mipsallegrexel
 	_host_alias=psp
-	append_var CXXFLAGS "-G0"
 	;;
 samsungtv)
 	_host_os=linux
@@ -3168,6 +3167,7 @@ EOF
 		append_var CXXFLAGS "-I$PSPSDK/include"
 		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
 		append_var CXXFLAGS "-D_PSP_FW_VERSION=150"
+		append_var CXXFLAGS "-G0"
 		add_line_to_config_mk 'PSP = 1'
 		;;
 	riscos)


Commit: 366e9997c4cd31b1babe50e7c6f27ec1a695d69d
    https://github.com/scummvm/scummvm/commit/366e9997c4cd31b1babe50e7c6f27ec1a695d69d
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-25T22:46:59+01:00

Commit Message:
COMMON: Fix freetype path for psp

Current config ends up pulling freetype headers from host which depending
on version on host and in toolchain may result in linking or runtime errors

Changed paths:
    configure


diff --git a/configure b/configure
index a32647ba30..9ff7607678 100755
--- a/configure
+++ b/configure
@@ -3164,6 +3164,10 @@ EOF
 		;;
 	psp)
 		_optimization_level=-O2
+		_freetypepath="$PSPDEV/psp/bin"
+		if test -z "$PKG_CONFIG_LIBDIR"; then
+			export PKG_CONFIG_LIBDIR="$PSPDEV/psp/lib/pkgconfig"
+		fi
 		append_var CXXFLAGS "-I$PSPSDK/include"
 		# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
 		append_var CXXFLAGS "-D_PSP_FW_VERSION=150"