Increased Android SDK and NDK version for Android 10, updated Italian and Spanish lang files, patch boost dependencies for TIME_UTC definition, fixed import for usleep.

2020-12-26 17:19:02 +01:00
parent b2c55e307c
commit f9e0746e1c
10 changed files with 60 additions and 35 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,8 @@ before_install:
      if [ `uname -m` = x86_64 ]; then 
        sudo dpkg --add-architecture i386 && sudo apt-get update &&
        sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi &&
-      wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
-      wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv;
+        wget https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip -nv &&
+        wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv;
    fi
    
 install:
@@ -44,8 +44,8 @@ install:
    tar -x --xz -f sdk.lzma;
  fi
 - if [ "$BUILD_ANDROID" == "YES" ]; then
-    tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
-    tar -zxf android-sdk_r24.3.4-linux.tgz &&
+    unzip android-ndk-r22-linux-x86_64.zip &&
+    tar -zxf android-sdk_r24.4.1-linux.tgz &&
    $ANDROID list sdk --extended -a &&
    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
  fi
--- a/Boost/boost/thread/xtime.hpp
+++ b/Boost/boost/thread/xtime.hpp
@@ -20,7 +20,7 @@ namespace boost {

 enum xtime_clock_types
 {
-    TIME_UTC=1
+    TIME_UTC_=1
 //    TIME_TAI,
 //    TIME_MONOTONIC,
 //    TIME_PROCESS,
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time)

 inline int xtime_get(struct xtime* xtp, int clock_type)
 {
-    if (clock_type == TIME_UTC)
+    if (clock_type == TIME_UTC_)
    {
        *xtp=get_xtime(get_system_time());
        return clock_type;
--- a/Boost/lib/pthread/thread.cpp
+++ b/Boost/lib/pthread/thread.cpp
@@ -350,7 +350,7 @@ namespace boost
                    cond.timed_wait(lock, xt);
 #   endif
                    xtime cur;
-                    xtime_get(&cur, TIME_UTC);
+                    xtime_get(&cur, TIME_UTC_);
                    if (xtime_cmp(xt, cur) <= 0)
                        return;
                }
@@ -365,7 +365,7 @@ namespace boost
            BOOST_VERIFY(!pthread_yield());
 #   else
            xtime xt;
-            xtime_get(&xt, TIME_UTC);
+            xtime_get(&xt, TIME_UTC_);
            sleep(xt);
 #   endif
        }
--- a/Boost/lib/pthread/timeconv.inl
+++ b/Boost/lib/pthread/timeconv.inl
@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000;
 inline void to_time(int milliseconds, boost::xtime& xt)
 {
    int res = 0;
-    res = boost::xtime_get(&xt, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&xt, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);

    xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
    xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts)
 {
    boost::xtime cur;
    int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);

    if (boost::xtime_cmp(xt, cur) <= 0)
    {
@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds)
 {
    boost::xtime cur;
    int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);

    if (boost::xtime_cmp(xt, cur) <= 0)
        milliseconds = 0;
@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds)
 {
    boost::xtime cur;
    int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);

    if (boost::xtime_cmp(xt, cur) <= 0)
        microseconds = 0;
--- a/JGE/src/SDLmain.cpp
+++ b/JGE/src/SDLmain.cpp
@@ -18,6 +18,11 @@
 #include <stdexcept>
 #include <iostream>
 #include <math.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>

 #if (defined FORCE_GLES)
 #undef GL_ES_VERSION_2_0
--- a/projects/mtg/Android/AndroidManifest.xml
+++ b/projects/mtg/Android/AndroidManifest.xml
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0231" android:installLocation="preferExternal" android:versionName="@string/app_version" package="net.wagic.app">
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
-        <activity android:debuggable="false" android:configChanges="keyboard|keyboardHidden|orientation" android:label="@string/app_name" android:name="org.libsdl.app.SDLActivity" android:screenOrientation="sensorLandscape">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-	</intent-filter>
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="13"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionCode="0231"
+          android:installLocation="preferExternal"
+          android:versionName="@string/app_version"
+          package="net.wagic.app">
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <application android:icon="@drawable/icon"
+               android:label="@string/app_name"
+               android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+               
+    <activity android:debuggable="false"
+              android:configChanges="keyboard|keyboardHidden|orientation"
+              android:label="@string/app_name"
+              android:name="org.libsdl.app.SDLActivity"
+              android:screenOrientation="sensorLandscape">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+  <uses-sdk android:minSdkVersion="10"
+            android:targetSdkVersion="29" />
 </manifest>
--- a/projects/mtg/Android/jni/Application.mk
+++ b/projects/mtg/Android/jni/Application.mk
@@ -1,8 +1,8 @@
 APP_PROJECT_PATH := $(call my-dir)/..
 APP_CPPFLAGS += -frtti -fexceptions
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := armeabi-v7a
 #APP_ABI := x86 # mainly for emulators
-APP_STL := gnustl_static
+APP_STL := c++_static
 APP_MODULES := libpng libjpeg main SDL

 #APP_OPTIM is 'release' by default
--- a/projects/mtg/bin/Res/lang/es.txt
+++ b/projects/mtg/bin/Res/lang/es.txt
@@ -1512,6 +1512,9 @@ Stone Hewer Mode=Modo Forjador
 Won with more than 10 equipments.=Gana con mas de 10 equipos.
 Hermit Druid Mode=Modo Druida ermitano
 Won with less than 10 lands.=Gana con menos de 10 tierras.
+Do you think you can dominate over other commanders? Take a big challenge in the commander format.=澧rees que puedes dominar a otros comandantes? Acepta un gran desaf甐 en el formato de comandante.
+Commander Format Unlocked=Modo Comandante desbloqueado
+Win a game with 40 or more life and with less creatures in your graveyard than your opponent.=Gana con 40 vidas o m嫳 y con menos criaturas en tu cementerio que tu oponente.

 Valuable Collection=El valor de la coleccion
 Collection valued over 10,000c.=La coleccion esta valuada en mas de 10,000 creditos.
--- a/projects/mtg/bin/Res/lang/it.txt
+++ b/projects/mtg/bin/Res/lang/it.txt
@@ -480,6 +480,8 @@ Commander Anthology Volume II=Antologia del Comandante: Volume II
 Commander 2018=Comandante 2018
 Commander 2019=Comandante 2019
 Commander 2020=Comandante 2020
+Commander Collection: Green=Collezione del Comandante: Verde
+Commander Legends=Leggenda del Comandante

 -Core Sets-
 Limited Edition Alpha=Edizione Limitata: Alfa
@@ -1026,6 +1028,9 @@ Card Spoiler=Vedi carte
 Back to Trophies=Torna a Trofei
 Back to Main Menu=Indietro al menu' principale
 Cancel=Annulla
+Do you think you can dominate over other commanders? Take a big challenge in the commander format.=Pensi di poter dominare gli altri comandanti? Raccogli la sfida con la modalilta' Comandante.
+Commander Format Unlocked=Modalita' Comandante sbloccata
+Win a game with 40 or more life and with less creatures in your graveyard than your opponent.=Vinci una partita con 40 o più punti vita e con meno creature nel cimitero rispetto al tuo avversario.

 Wagic Team (%s%%): %i%% : %s%%/%s%% cards=Team Wagic (%s%%): %i%% : %s%%/%s%% carte
 %i cards=%i carte.
--- a/tools/travis-script.sh
+++ b/tools/travis-script.sh
@@ -61,7 +61,7 @@ fi

 # we're building an Android binary here
 if [ "$BUILD_ANDROID" = "YES" ]; then
-    android-ndk-r9/ndk-build -C projects/mtg/Android -j4
+    android-ndk-r22/ndk-build -C projects/mtg/Android -j4
    $ANDROID list targets
    $ANDROID update project -t 1 -p projects/mtg/Android
    ant debug -f projects/mtg/Android/build.xml