From df8388ac169cf6fd1cacd7c705b162cd6ccde1de Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Wed, 25 Jan 2017 19:30:37 +0100 Subject: [PATCH] Python3 improvementso --- .../jni/application/commandergenius/AndroidAppSettings.cfg | 2 +- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/python3/Android.mk | 4 ++-- project/jni/python3/python3-android | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 1330792a0..042e5cc39 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -215,7 +215,7 @@ CompiledLibraries="sdl_image boost_system crypto ssl curl vorbis ogg python3" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/lib/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include' +AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DDOWNLOADER=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DUSE_PYTHON3=1 -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DIOAPI_NO_64 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/lib/GsKit -Ijni/vorbis/include/vorbis -Ijni/curl/include -Ijni/python3/include/python3.5m' # Additional LDFLAGS for application diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 2d267fa5e..bf587df67 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 2d267fa5e197aa1842c5353045599fdd3d6e4a96 +Subproject commit bf587df67cd775663b8f3e48ec0827d71155c897 diff --git a/project/jni/python3/Android.mk b/project/jni/python3/Android.mk index 4cb5b93f8..d5d38f4d1 100644 --- a/project/jni/python3/Android.mk +++ b/project/jni/python3/Android.mk @@ -13,7 +13,7 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := -LOCAL_LDLIBS := +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog LOCAL_SRC_FILES = lib/libpython3.5m.so @@ -32,7 +32,7 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := python3.5m -LOCAL_LDLIBS := +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog LOCAL_SRC_FILES = lib/libpython3.so diff --git a/project/jni/python3/python3-android b/project/jni/python3/python3-android index a81e23364..2763176c1 160000 --- a/project/jni/python3/python3-android +++ b/project/jni/python3/python3-android @@ -1 +1 @@ -Subproject commit a81e23364609045b1b7e0087d55a985cbdaecb23 +Subproject commit 2763176c16ebad160133f8025d1b7390cd0efefe