Skip to content

Commit

Permalink
BUILD: Move some Android 'hack' back to near end of configure
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin committed May 25, 2011
1 parent d935c53 commit 6639eac
Showing 1 changed file with 27 additions and 18 deletions.
45 changes: 27 additions & 18 deletions configure
Expand Up @@ -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)
Expand Down Expand Up @@ -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
#
Expand Down

0 comments on commit 6639eac

Please sign in to comment.