From 5d05a7cff2895ee062fb09295036c780669af268 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 12 Feb 2018 22:32:40 +0200 Subject: [PATCH] SDL: fixed setEnvironment.sh scripts to work with GCC, fixed BasiliskII compilation --- project/jni/application/basiliskii/AndroidBuild.sh | 6 ++++-- project/jni/application/basiliskii/basiliskii | 2 +- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/hid-pc-keyboard/src | 2 +- project/jni/application/openlierox/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openlierox/src | 2 +- project/jni/application/openttd/src | 2 +- project/jni/application/setEnvironment-arm64-v8a.sh | 4 +++- project/jni/application/setEnvironment-armeabi-v7a.sh | 4 +++- project/jni/application/setEnvironment-mips.sh | 4 +++- project/jni/application/setEnvironment-x86.sh | 4 +++- project/jni/application/setEnvironment-x86_64.sh | 4 +++- project/jni/application/setEnvironment.sh | 4 +++- 13 files changed, 29 insertions(+), 15 deletions(-) diff --git a/project/jni/application/basiliskii/AndroidBuild.sh b/project/jni/application/basiliskii/AndroidBuild.sh index 873486044..c5b509337 100755 --- a/project/jni/application/basiliskii/AndroidBuild.sh +++ b/project/jni/application/basiliskii/AndroidBuild.sh @@ -13,12 +13,14 @@ JOBS=4 if [ \! -f basiliskii/src/Unix/configure ] ; then sh -c "cd basiliskii/src/Unix && ./autogen.sh" + rm -f basiliskii/src/Unix/Makefile fi if [ \! -f basiliskii/src/Unix/Makefile ] ; then env CFLAGS="-Ofast" \ - env LIBS="-lgnustl_static" \ - ../setEnvironment-$1.sh sh -c "cd basiliskii/src/Unix && ./configure --build=x86_64-unknown-linux-gnu --host=$2 --enable-sdl-video --enable-sdl-audio --without-gtk --without-esd --without-x" + env LIBS="-lgnustl_static -lc -lm" \ + ../setEnvironment-$1.sh sh -c "cd basiliskii/src/Unix && env no_dev_ptmx=1 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_sys_file_offset_bits=no \ + ./configure --build=x86_64-unknown-linux-gnu --host=$2 --enable-sdl-video --enable-sdl-audio --without-gtk --without-esd --without-x" || exit 1 fi make -C basiliskii/src/Unix -j$JOBS && mv -f basiliskii/src/Unix/BasiliskII libapplication-$1.so diff --git a/project/jni/application/basiliskii/basiliskii b/project/jni/application/basiliskii/basiliskii index 637f57191..06a7bb327 160000 --- a/project/jni/application/basiliskii/basiliskii +++ b/project/jni/application/basiliskii/basiliskii @@ -1 +1 @@ -Subproject commit 637f571914b3b51356935082587ec06d93c77b5f +Subproject commit 06a7bb327cea0de0265b98d16807ab679a2e6433 diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index ab2e62920..e317abb6f 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit ab2e629201d69463f8e73570b8bb26b6f7cf32de +Subproject commit e317abb6fe1a2bdd62a161d964f77bb2dd9773e5 diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index 7f10fa4b8..690f76fee 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit 7f10fa4b84251a9e511bb0fb952bd1b5d946509a +Subproject commit 690f76feeeabb0eebc11cf062e2d2c52d509876c diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index abdb5d239..f07eaa9de 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenLieroX" AppFullName=openlierox.net # Application version code (integer) -AppVersionCode=10580310 +AppVersionCode=10580316 # Application user-visible version name (string) -AppVersionName="0.58rc3a10" +AppVersionName="0.58rc3a16" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index 7d108c44c..f4a0d3d02 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit 7d108c44c8082bd5f8d61f47efe4dc1c2f489e4b +Subproject commit f4a0d3d02e6b0dd6444ec03382163cc7df855845 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index bbeaad03e..c029120a7 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit bbeaad03e4b470d0f114b252374c82942a1f1d07 +Subproject commit c029120a7b7eb692fa38855940c4d7fd90a7636e diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh index 80f0a41e0..e85574ddb 100755 --- a/project/jni/application/setEnvironment-arm64-v8a.sh +++ b/project/jni/application/setEnvironment-arm64-v8a.sh @@ -80,7 +80,9 @@ CFLAGS="\ -O2 -g -DNDEBUG \ -fomit-frame-pointer -fno-strict-aliasing -finline-limit=300 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-arm64/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/aarch64-linux-android \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \ diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index 5133a1b23..0b8690f0e 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -80,7 +80,9 @@ CFLAGS="\ -mfpu=vfpv3-d16 -mthumb -O2 -g -DNDEBUG \ -fomit-frame-pointer -fno-strict-aliasing -finline-limit=300 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/arm-linux-androideabi \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \ diff --git a/project/jni/application/setEnvironment-mips.sh b/project/jni/application/setEnvironment-mips.sh index cfc0388b4..4715f8d0b 100755 --- a/project/jni/application/setEnvironment-mips.sh +++ b/project/jni/application/setEnvironment-mips.sh @@ -58,7 +58,9 @@ CFLAGS="\ -no-canonical-prefixes -O2 -g -DNDEBUG -fomit-frame-pointer \ -funswitch-loops -finline-limit=300 -mips32 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-mips/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/mipsel-linux-android \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \ diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index ff5b5d168..73a2f88be 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -80,7 +80,9 @@ CFLAGS="\ -fomit-frame-pointer -fstrict-aliasing -funswitch-loops \ -finline-limit=300 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-x86/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/i686-linux-android \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \ diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh index 3bac700d0..1362837c1 100755 --- a/project/jni/application/setEnvironment-x86_64.sh +++ b/project/jni/application/setEnvironment-x86_64.sh @@ -80,7 +80,9 @@ CFLAGS="\ -fomit-frame-pointer -fstrict-aliasing -funswitch-loops \ -finline-limit=300 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-x86_64/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/x86_64-linux-android \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \ diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh index 1d3bde2eb..bf728637e 100755 --- a/project/jni/application/setEnvironment.sh +++ b/project/jni/application/setEnvironment.sh @@ -58,7 +58,9 @@ CFLAGS="\ -mthumb -O2 -g -DNDEBUG \ -fomit-frame-pointer -fno-strict-aliasing -finline-limit=300 \ -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \ --isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \ +-isystem$NDK/sysroot/usr/include \ +-isystem$NDK/sysroot/usr/include/arm-linux-androideabi \ +-D__ANDROID_API__=`echo $PLATFORMVER | grep -o '[0-9]*'` \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/libs/$ARCH/include \ -isystem$NDK/sources/cxx-stl/gnu-libstdc++/$NDK_TOOLCHAIN_VERSION/include/backward \