[Scummvm-cvs-logs] scummvm master -> 2779e6825c266f271cba0da9257dadb5061e963e

digitall dgturner at iee.org
Wed Apr 30 02:15:16 CEST 2014


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:
2779e6825c PS2: Fix hardcoded library settings to allow building against old SDK.


Commit: 2779e6825c266f271cba0da9257dadb5061e963e
    https://github.com/scummvm/scummvm/commit/2779e6825c266f271cba0da9257dadb5061e963e
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-30T01:16:42+01:00

Commit Message:
PS2: Fix hardcoded library settings to allow building against old SDK.

The autodetection should be fixed or modified to remove these hardcoded
library enables. For now, we add another minor HACK to disable the
troublesome Tremor Ogg Vorbis enable on older SDK, which should fix the
buildbot builds.

Changed paths:
    configure



diff --git a/configure b/configure
index f0c01ce..4e4e9d1 100755
--- a/configure
+++ b/configure
@@ -2710,7 +2710,10 @@ if test -n "$_host"; then
 			# This trick doesn't work for tremor right now, as the PS2 port the resulting library
 			# libtremor, while our code later on expects it to be called libvorbisidec.
 			# TODO: Enable tremor, e.g. by adding  -ltremor or by renaming the lib.
-			_tremor=yes
+			# Disable this for older SDK as this breaks the build otherwise...
+			if test -z "$PS2SDK_OLD"; then
+				_tremor=yes
+			fi
 			_mad=yes
 			_zlib=yes
 			# HACK to fix compilation of C source files for now.






More information about the Scummvm-git-logs mailing list