Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Vittorio Alfieri
2020-12-26 17:19:02 +01:00
parent b2c55e307c
commit f9e0746e1c
10 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -35,8 +35,8 @@ before_install:
if [ `uname -m` = x86_64 ]; then if [ `uname -m` = x86_64 ]; then
sudo dpkg --add-architecture i386 && sudo apt-get update && 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 && 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 https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip -nv &&
wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv; wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv;
fi fi
install: install:
@@ -44,8 +44,8 @@ install:
tar -x --xz -f sdk.lzma; tar -x --xz -f sdk.lzma;
fi fi
- if [ "$BUILD_ANDROID" == "YES" ]; then - if [ "$BUILD_ANDROID" == "YES" ]; then
tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && unzip android-ndk-r22-linux-x86_64.zip &&
tar -zxf android-sdk_r24.3.4-linux.tgz && tar -zxf android-sdk_r24.4.1-linux.tgz &&
$ANDROID list sdk --extended -a && $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; echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
fi fi

4
Boost/boost/thread/xtime.hpp
View File

@@ -20,7 +20,7 @@ namespace boost {
enum xtime_clock_types enum xtime_clock_types
{ {
TIME_UTC=1 TIME_UTC_=1
// TIME_TAI, // TIME_TAI,
// TIME_MONOTONIC, // TIME_MONOTONIC,
// TIME_PROCESS, // 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) 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()); *xtp=get_xtime(get_system_time());
return clock_type; return clock_type;

4
Boost/lib/pthread/thread.cpp
View File

@@ -350,7 +350,7 @@ namespace boost
cond.timed_wait(lock, xt); cond.timed_wait(lock, xt);
# endif # endif
xtime cur; xtime cur;
xtime_get(&cur, TIME_UTC); xtime_get(&cur, TIME_UTC_);
if (xtime_cmp(xt, cur) <= 0) if (xtime_cmp(xt, cur) <= 0)
return; return;
} }
@@ -365,7 +365,7 @@ namespace boost
BOOST_VERIFY(!pthread_yield()); BOOST_VERIFY(!pthread_yield());
# else # else
xtime xt; xtime xt;
xtime_get(&xt, TIME_UTC); xtime_get(&xt, TIME_UTC_);
sleep(xt); sleep(xt);
# endif # endif
} }

16
Boost/lib/pthread/timeconv.inl
View File

@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000;
inline void to_time(int milliseconds, boost::xtime& xt) inline void to_time(int milliseconds, boost::xtime& xt)
{ {
int res = 0; int res = 0;
res = boost::xtime_get(&xt, boost::TIME_UTC); res = boost::xtime_get(&xt, boost::TIME_UTC_);
BOOST_ASSERT(res == boost::TIME_UTC); BOOST_ASSERT(res == boost::TIME_UTC_);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((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; boost::xtime cur;
int res = 0; int res = 0;
res = boost::xtime_get(&cur, boost::TIME_UTC); res = boost::xtime_get(&cur, boost::TIME_UTC_);
BOOST_ASSERT(res == boost::TIME_UTC); BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0) if (boost::xtime_cmp(xt, cur) <= 0)
{ {
@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds)
{ {
boost::xtime cur; boost::xtime cur;
int res = 0; int res = 0;
res = boost::xtime_get(&cur, boost::TIME_UTC); res = boost::xtime_get(&cur, boost::TIME_UTC_);
BOOST_ASSERT(res == boost::TIME_UTC); BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0) if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0; milliseconds = 0;
@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds)
{ {
boost::xtime cur; boost::xtime cur;
int res = 0; int res = 0;
res = boost::xtime_get(&cur, boost::TIME_UTC); res = boost::xtime_get(&cur, boost::TIME_UTC_);
BOOST_ASSERT(res == boost::TIME_UTC); BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0) if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0; microseconds = 0;

5
JGE/src/SDLmain.cpp
View File

@@ -18,6 +18,11 @@
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#ifndef WIN32
#include <unistd.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#if (defined FORCE_GLES) #if (defined FORCE_GLES)
#undef GL_ES_VERSION_2_0 #undef GL_ES_VERSION_2_0

40
projects/mtg/Android/AndroidManifest.xml
View File

@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?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"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> android:versionCode="0231"
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> android:installLocation="preferExternal"
<uses-permission android:name="android.permission.INTERNET"/> android:versionName="@string/app_version"
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> package="net.wagic.app">
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<activity android:debuggable="false" android:configChanges="keyboard|keyboardHidden|orientation" android:label="@string/app_name" android:name="org.libsdl.app.SDLActivity" android:screenOrientation="sensorLandscape"> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<intent-filter> <uses-permission android:name="android.permission.INTERNET" />
<action android:name="android.intent.action.MAIN"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<category android:name="android.intent.category.LAUNCHER"/> <application android:icon="@drawable/icon"
</intent-filter> android:label="@string/app_name"
</activity> android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
</application>
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="13"/> <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> </manifest>

4
projects/mtg/Android/jni/Application.mk
View File

@@ -1,8 +1,8 @@
APP_PROJECT_PATH := $(call my-dir)/.. APP_PROJECT_PATH := $(call my-dir)/..
APP_CPPFLAGS += -frtti -fexceptions APP_CPPFLAGS += -frtti -fexceptions
APP_ABI := armeabi armeabi-v7a APP_ABI := armeabi-v7a
#APP_ABI := x86 # mainly for emulators #APP_ABI := x86 # mainly for emulators
APP_STL := gnustl_static APP_STL := c++_static
APP_MODULES := libpng libjpeg main SDL APP_MODULES := libpng libjpeg main SDL
#APP_OPTIM is 'release' by default #APP_OPTIM is 'release' by default

3
projects/mtg/bin/Res/lang/es.txt
View File

@@ -1512,6 +1512,9 @@ Stone Hewer Mode=Modo Forjador
Won with more than 10 equipments.=Gana con mas de 10 equipos. Won with more than 10 equipments.=Gana con mas de 10 equipos.
Hermit Druid Mode=Modo Druida ermitano Hermit Druid Mode=Modo Druida ermitano
Won with less than 10 lands.=Gana con menos de 10 tierras. 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 Valuable Collection=El valor de la coleccion
Collection valued over 10,000c.=La coleccion esta valuada en mas de 10,000 creditos. Collection valued over 10,000c.=La coleccion esta valuada en mas de 10,000 creditos.

5
projects/mtg/bin/Res/lang/it.txt
View File

@@ -480,6 +480,8 @@ Commander Anthology Volume II=Antologia del Comandante: Volume II
Commander 2018=Comandante 2018 Commander 2018=Comandante 2018
Commander 2019=Comandante 2019 Commander 2019=Comandante 2019
Commander 2020=Comandante 2020 Commander 2020=Comandante 2020
Commander Collection: Green=Collezione del Comandante: Verde
Commander Legends=Leggenda del Comandante
-Core Sets- -Core Sets-
Limited Edition Alpha=Edizione Limitata: Alfa Limited Edition Alpha=Edizione Limitata: Alfa
@@ -1026,6 +1028,9 @@ Card Spoiler=Vedi carte
Back to Trophies=Torna a Trofei Back to Trophies=Torna a Trofei
Back to Main Menu=Indietro al menu' principale Back to Main Menu=Indietro al menu' principale
Cancel=Annulla 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 Wagic Team (%s%%): %i%% : %s%%/%s%% cards=Team Wagic (%s%%): %i%% : %s%%/%s%% carte
%i cards=%i carte. %i cards=%i carte.

2
tools/travis-script.sh
View File

@@ -61,7 +61,7 @@ fi
# we're building an Android binary here # we're building an Android binary here
if [ "$BUILD_ANDROID" = "YES" ]; then 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 list targets
$ANDROID update project -t 1 -p projects/mtg/Android $ANDROID update project -t 1 -p projects/mtg/Android
ant debug -f projects/mtg/Android/build.xml ant debug -f projects/mtg/Android/build.xml