thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Move some Android 'hack' back to near end of configure

Browse source
This commit is contained in:
Max Horn 2011-05-05 14:21:17 +02:00
parent d935c53cdf
commit 6639eacb3a
1 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

45
configure vendored
View file

@ -2093,24 +2093,6 @@ case $_backend in
CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
static_libs=''
system_libs=''
for lib in $LIBS; do
case $lib in
-lz|-lm)
system_libs="$system_libs $lib"
;;
*)
static_libs="$static_libs $lib"
;;
esac
done
# -lgcc is carefully placed here - we want to catch
# all toolchain symbols in *our* libraries rather
# than pick up anything unhygenic from the Android libs.
LIBS="-Wl,-Bstatic $static_libs"
LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
;;
dc)
@ -3152,6 +3134,33 @@ else
echo
fi
#
# Some last-minute backend specific stuff, executed
# after all of CXXFLAGS, LDFLAGS, LIBS etc. have been setup
#
case $_backend in
android)
static_libs=''
system_libs=''
for lib in $LIBS; do
case $lib in
-lz|-lm)
system_libs="$system_libs $lib"
;;
*)
static_libs="$static_libs $lib"
;;
esac
done
# -lgcc is carefully placed here - we want to catch
# all toolchain symbols in *our* libraries rather
# than pick up anything unhygenic from the Android libs.
LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
;;
esac
#
# Engine selection
#