Merge branch 'freeminer' into 'master'

Update freeminer and fix build



See merge request !1038
This commit is contained in:
Boris Kraut 2015-11-09 07:49:55 +00:00
commit f7b0bb5298

View file

@ -25,6 +25,8 @@ Features:
Repo Type:git
Repo:https://github.com/freeminer/freeminer.git
Build:0.4.12.6.13,13
commit=202a17e58eecb6325a55bee5404e1d4a59021047
subdir=build/android
@ -34,6 +36,7 @@ Build:0.4.12.6.13,13
for n in 1 2 3; do make release && \
break; done
buildjni=no
scanignore=build/windows
Build:0.4.12.6.15,15
commit=65dd040a3ef160e8967e96b2c6abf7c772859d30
@ -44,6 +47,7 @@ Build:0.4.12.6.15,15
for n in 1 2 3; do make release && \
break; done
buildjni=no
scanignore=build/windows
Build:0.4.12.6.25,25
disable=build fails
@ -55,8 +59,21 @@ Build:0.4.12.6.25,25
for n in 1 2 3; do make release && \
break; done
buildjni=no
scanignore=build/windows
Build:0.4.13.7.48,48
commit=d6191aa610df21720d0f13650e51772d23df1e52
subdir=build/android
submodules=yes
output=bin/freeminer-release-unsigned.apk
build=printf "%s\n%s\n%s" "ANDROID_NDK = $$NDK$$" "NDK_MODULE_PATH = $$NDK$$/toolchains" "SDKFOLDER = $$SDK$$" > path.cfg && \
for n in 1 2 3; do make release && \
break; done
buildjni=no
scanignore=build/windows
Auto Update Mode:None
Update Check Mode:None
Current Version:0.4.12.6.25
Current Version Code:25
Current Version:0.4.13.7.48
Current Version Code:48