diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-08-08 07:19:10 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-08-08 08:09:30 +0000 |
| commit | b4377cf4bde9b5a27b671913aa9749f8e37b55b9 (patch) | |
| tree | 45556fe488c422f89be45a7495626081d53c5140 /commonplatform.pri | |
| parent | 6efbd8892b4b5875b86614d0ad9f2160a34a27e8 (diff) | |
Clean up android build
Change-Id: I8b4783d47b0ac9bfd0e636dcfb564d52ae6522f2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'commonplatform.pri')
| -rw-r--r-- | commonplatform.pri | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/commonplatform.pri b/commonplatform.pri index aadadb2..bf6b39a 100644 --- a/commonplatform.pri +++ b/commonplatform.pri @@ -21,7 +21,6 @@ DEFINES += \ win32: PlatformSpecificDir = windows macos: PlatformSpecificDir = macos linux|integrity|qnx: PlatformSpecificDir = linux -android: PlatformSpecificDir = android/jni integrity: { DEFINES += _LINUX @@ -258,12 +257,8 @@ clang { android { QMAKE_CXXFLAGS -= -fstack-protector-strong QMAKE_CFLAGS -= -fstack-protector-strong - # TODO: Should be done using this instead of copying the GLES headers, but including this - # causes lots of conflicting definitions in signal.h for some reason. Feel free to fix it if - # you know how. After this works, GLES3 and GLES2 folders can be deleted from - # 3rdparty/RuntimePlatformSpecific/Android/jni -# INCLUDEPATH += $$(ANDROID_NDK_ROOT)/sysroot/usr/include -# DEFINES += __BITS_PER_LONG=32 + INCLUDEPATH += $$(ANDROID_NDK_ROOT)/sysroot/usr/include + DEFINES += __BITS_PER_LONG=32 } win32 { |