[Scummvm-cvs-logs] scummvm master -> bfc9afbb3290a05b442ffbb5c467ccdf559b722e

[digitall]

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:
bfc9afbb32 PS2: Add support for building against old SDK if PS2SDK_OLD envvar set.


Commit: bfc9afbb3290a05b442ffbb5c467ccdf559b722e
    https://github.com/scummvm/scummvm/commit/bfc9afbb3290a05b442ffbb5c467ccdf559b722e
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T03:26:53+01:00

Commit Message:
PS2: Add support for building against old SDK if PS2SDK_OLD envvar set.

This will allow compilation using the older SDK until the buildbot
PS2 toolchain SDK can be upgraded and we can confirm the newer SDK
builds are working correctly.

Changed paths:
    configure



diff --git a/configure b/configure
index b901943..f0c01ce 100755
--- a/configure
+++ b/configure
@@ -2316,7 +2316,9 @@ case $_host_os in
 		CXXFLAGS="$CXXFLAGS -G2"
 		DEFINES="$DEFINES -D_EE"
 		DEFINES="$DEFINES -D__PLAYSTATION2__"
-		DEFINES="$DEFINES -D__NEW_PS2SDK__"
+		if test -z "$PS2SDK_OLD"; then
+			DEFINES="$DEFINES -D__NEW_PS2SDK__"
+		fi
 		;;
 	ps3)
 		# Force use of SDL and freetype from the ps3 toolchain