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

Android Fix

Browse Source
This commit is contained in:
valfieri
2019-08-18 17:33:00 +02:00
parent 9be1d44788
commit 301de0f6f7
6 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Boost/boost/smart_ptr/shared_ptr.hpp
+3 -1
View File
@@ -182,7 +182,9 @@ public:
shared_ptr(): px(0), pn() // never throws in 1.30+ shared_ptr(): px(0), pn() // never throws in 1.30+
{ {
} }
shared_ptr(const shared_ptr&) = default;
template<class Y> template<class Y>
explicit shared_ptr( Y * p ): px( p ), pn( p ) // Y must be complete explicit shared_ptr( Y * p ): px( p ), pn( p ) // Y must be complete
{ {
Boost/boost/thread/xtime.hpp
+1 -1
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,
Boost/lib/pthread/timeconv.inl
+8 -8
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;
projects/mtg/Android/AndroidManifest.xml
+28 -16
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="0201" 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="0211"
<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="10"/> <activity android:debuggable="false"
</manifest> 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="16"
android:targetSdkVersion="16" />
</manifest>
projects/mtg/Android/jni/Application.mk
+2 -2
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
projects/mtg/Android/project.properties
+1 -1
View File
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-10 target=android-29