developing...

This commit is contained in:
Oleg Korshul
2019-10-30 20:16:59 +03:00
parent f8c7bda679
commit 8d6249f9a5
3 changed files with 20 additions and 4 deletions

View File

@ -188,8 +188,7 @@ core_ios {
}
}
core_android {
equals(QT_ARCH, arm): CORE_BUILDS_PLATFORM_PREFIX = android_arm
equals(QT_ARCH, i386): CORE_BUILDS_PLATFORM_PREFIX = android_x86
CORE_BUILDS_PLATFORM_PREFIX = $$join(ANDROID_TARGET_ARCH, ANDROID_TARGET_ARCH, "android_", "")
}
core_debug {

View File

@ -68,6 +68,21 @@ core_ios {
LIBS += -framework Foundation
}
core_android {
DEFINES += USE_FILE32API
SOURCES += ./FileDownloader/FileDownloader_curl.cpp
CONFIG += use_external_download
use_external_download {
DEFINES += USE_EXTERNAL_DOWNLOAD
} else {
include(../Common/3dParty/curl/curl.pri)
}
DEFINES += NOT_USE_PTHREAD_CANCEL
}
# CONFIG
HEADERS += ./kernel_config.h

View File

@ -30,7 +30,7 @@
*
*/
#ifdef __ANDROID__
#if defined(__ANDROID__) && !defined (NOT_USE_PTHREAD_CANCEL)
#include <pthread_setcanceltype.h>
#endif
@ -111,9 +111,11 @@ namespace NSThreads
};
#else
void* CBaseThread::__ThreadProc(void* pv)
{
{
#ifndef NOT_USE_PTHREAD_CANCEL
int old_thread_type;
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old_thread_type);
#endif
CBaseThread* pThis = (CBaseThread*)pv;
pThis->ThreadProc();