aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-10-09 12:28:11 +0000
committerMax Horn2009-10-09 12:28:11 +0000
commit22477093b4c4f74b2263ea8b0f23724527dff4da (patch)
tree2de023404f2e5f456d82251e7164fc530e913468
parent0d5ba6ac6c865e42bb889ea607c1d0e9586dae17 (diff)
downloadscummvm-rg350-22477093b4c4f74b2263ea8b0f23724527dff4da.tar.gz
scummvm-rg350-22477093b4c4f74b2263ea8b0f23724527dff4da.tar.bz2
scummvm-rg350-22477093b4c4f74b2263ea8b0f23724527dff4da.zip
PS2: Hack to enable zlib/mad support for now (until detection & linker issue have been fixed)
svn-id: r44824
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 8737f44ea9..29791161ab 100755
--- a/configure
+++ b/configure
@@ -1581,6 +1581,12 @@ if test -n "$_host"; then
_build_scalers="no"
_build_hq_scalers="no"
_mt32emu="no"
+ # HACK to enable mad & zlib (they are not properly detected due to linker issues).
+ # The same does not currently for tremor, 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.
+ _mad="yes"
+ _zlib="yes"
# HACK to fix compilation of C source files for now.
add_line_to_config_mk 'CC = ee-gcc'
# HACK to fix linking for now. It seems ee-g++ does not handle linking correctly.
@@ -2318,7 +2324,7 @@ case $_backend in
INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
- LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++ "
+ LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
;;
*)
echo "support for $_backend backend not implemented in configure script yet"