diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -1505,12 +1505,21 @@ case $_host_os in ;; android) CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm" - CXXFLAGS="$CXXFLAGS -Os -mandroid -msoft-float -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale" + CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale -msoft-float" + CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables" + if test "$_release_build" = yes; then + CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing" + else + CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" + fi + CXXFLAGS="$CXXFLAGS -finline-limit=300" + CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork" + CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__" + CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__" # supress 'mangling of 'va_list' has changed in GCC 4.4' CXXFLAGS="$CXXFLAGS -Wno-psabi" LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm" - LDFLAGS="$LDFLAGS -mandroid -mthumb-interwork" + LDFLAGS="$LDFLAGS -mthumb-interwork" add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK" _unix=yes _seq_midi=no @@ -1580,7 +1589,6 @@ case $_host_os in DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE" # Needs -lnetwork for the timidity MIDI driver LIBS="$LIBS -lnetwork" - CXXFLAGS="$CXXFLAGS -fhuge-objects" _unix=yes _seq_midi=no ;; @@ -2096,7 +2104,7 @@ fi # Enable 16bit support only for backends which support it # case $_backend in - dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | wii) + android | dingux | dreamcast | gph | openpandora | psp | samsungtv | sdl | wii) if test "$_16bit" = auto ; then _16bit=yes else @@ -2956,6 +2964,10 @@ fi # case $_backend in android) + # ssp at this point so the cxxtests link + CXXFLAGS="$CXXFLAGS -fstack-protector -Wa,--noexecstack" + LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" + static_libs='' system_libs='' for lib in $LIBS; do @@ -2974,7 +2986,7 @@ case $_backend in # 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 -D__ANDROID__ -DREDUCE_MEMORY_USAGE" + DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE" ;; dc) INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include' |