miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: fixed setEnvironment.sh scripts to work with GCC, fixed BasiliskII compilation

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-02-12 22:32:40 +02:00
parent d359e80b9b
commit 5d05a7cff2
13 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/basiliskii/AndroidBuild.sh
View File

@@ -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

2
project/jni/application/basiliskii/basiliskii

Submodule project/jni/application/basiliskii/basiliskii updated: 637f571914...06a7bb327c

2
project/jni/application/commandergenius/commandergenius

Submodule project/jni/application/commandergenius/commandergenius updated: ab2e629201...e317abb6fe

2
project/jni/application/hid-pc-keyboard/src

Submodule project/jni/application/hid-pc-keyboard/src updated: 7f10fa4b84...690f76feee

4
project/jni/application/openlierox/AndroidAppSettings.cfg
View File

@@ -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

2
project/jni/application/openlierox/src

Submodule project/jni/application/openlierox/src updated: 7d108c44c8...f4a0d3d02e

2
project/jni/application/openttd/src

Submodule project/jni/application/openttd/src updated: bbeaad03e4...c029120a7b

4
project/jni/application/setEnvironment-arm64-v8a.sh
View File

@@ -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 \

4
project/jni/application/setEnvironment-armeabi-v7a.sh
View File

@@ -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 \

4
project/jni/application/setEnvironment-mips.sh
View File

@@ -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 \

4
project/jni/application/setEnvironment-x86.sh
View File

@@ -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 \

4
project/jni/application/setEnvironment-x86_64.sh
View File

@@ -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 \

4
project/jni/application/setEnvironment.sh
View File

@@ -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 \