Merge remote-tracking branch 'origin/feature/develop-and' into develop

Add support android build
This commit is contained in:
Oleg Korshul
2020-04-19 15:37:56 +03:00
11 changed files with 195 additions and 33 deletions

View File

@ -21,7 +21,7 @@ DEFINES -= \
UNICODE \
_UNICODE
core_linux {
!core_windows {
DEFINES += \
HAVE_UNISTD_H \
HAVE_MBSTATE_T \
@ -31,27 +31,8 @@ core_linux {
UNIX \
HAVE_STDINCLUDES
}
core_mac {
DEFINES += \
HAVE_UNISTD_H \
HAVE_MBSTATE_T \
GCONTAINER_NO_MEMBER_TEMPLATES="1" \
HAS_WCHAR \
HAVE_WCHAR_H \
UNIX \
HAVE_STDINCLUDES
}
core_ios {
DEFINES += \
HAVE_UNISTD_H \
HAVE_MBSTATE_T \
GCONTAINER_NO_MEMBER_TEMPLATES="1" \
HAS_WCHAR \
HAVE_WCHAR_H \
UNIX \
HAVE_STDINCLUDES
core_android {
DEFINES += HAS_MBSTATE="1"
}
core_windows {