Line 189... |
Line 189... |
189 |
CONFIG += c++17
|
189 |
CONFIG += c++17
|
190 |
QMAKE_CXXFLAGS += -std=c++17 -DPJ_AUTOCONF
|
190 |
QMAKE_CXXFLAGS += -std=c++17 -DPJ_AUTOCONF
|
191 |
QMAKE_LFLAGS += -std=c++17
|
191 |
QMAKE_LFLAGS += -std=c++17
|
192 |
|
192 |
|
193 |
equals(ANDROID_TARGET_ARCH,arm64-v8a) {
|
193 |
equals(ANDROID_TARGET_ARCH,arm64-v8a) {
|
194 |
INCLUDEPATH += $$EXT_LIB_PATH/openssl/arm64-v8a/include
|
194 |
# INCLUDEPATH += $$EXT_LIB_PATH/openssl/arm64-v8a/include
|
195 |
|
195 |
|
196 |
LIBS += $$EXT_LIB_PATH/skia/arm64/libskia.a \
|
196 |
LIBS += $$EXT_LIB_PATH/skia/arm64/libskia.a \
|
197 |
-L$$SDK_PATH/android_openssl/no-asm/latest/arm64 \
|
197 |
-L$$SDK_PATH/android_openssl/no-asm/latest/arm64 \
|
198 |
$$EXT_LIB_PATH/pjsip/lib/libpj-aarch64-unknown-linux-android.a \
|
198 |
$$EXT_LIB_PATH/pjsip/lib/libpj-aarch64-unknown-linux-android.a \
|
199 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-aarch64-unknown-linux-android.a \
|
199 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-aarch64-unknown-linux-android.a \
|
Line 212... |
Line 212... |
212 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-aarch64-unknown-linux-android.a \
|
212 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-aarch64-unknown-linux-android.a \
|
213 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-aarch64-unknown-linux-android.a
|
213 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-aarch64-unknown-linux-android.a
|
214 |
}
|
214 |
}
|
215 |
|
215 |
|
216 |
equals(ANDROID_TARGET_ARCH,armeabi-v7a) {
|
216 |
equals(ANDROID_TARGET_ARCH,armeabi-v7a) {
|
217 |
INCLUDEPATH += $$EXT_LIB_PATH/openssl/armeabi-v7a/include
|
217 |
# INCLUDEPATH += $$EXT_LIB_PATH/openssl/armeabi-v7a/include
|
218 |
|
218 |
|
219 |
LIBS += $$EXT_LIB_PATH/skia/arm/libskia.a \
|
219 |
LIBS += $$EXT_LIB_PATH/skia/arm/libskia.a \
|
220 |
-L$$SDK_PATH/android_openssl/no-asm/latest/arm \
|
220 |
-L$$SDK_PATH/android_openssl/no-asm/latest/arm \
|
221 |
$$EXT_LIB_PATH/pjsip/lib/libpj-armv7-unknown-linux-android.a \
|
221 |
$$EXT_LIB_PATH/pjsip/lib/libpj-armv7-unknown-linux-android.a \
|
222 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-armv7-unknown-linux-android.a \
|
222 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-armv7-unknown-linux-android.a \
|
Line 235... |
Line 235... |
235 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-armv7-unknown-linux-android.a \
|
235 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-armv7-unknown-linux-android.a \
|
236 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-armv7-unknown-linux-android.a
|
236 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-armv7-unknown-linux-android.a
|
237 |
}
|
237 |
}
|
238 |
|
238 |
|
239 |
equals(ANDROID_TARGET_ARCH,x86) {
|
239 |
equals(ANDROID_TARGET_ARCH,x86) {
|
240 |
INCLUDEPATH += $$EXT_LIB_PATH/openssl/x86/include
|
240 |
# INCLUDEPATH += $$EXT_LIB_PATH/openssl/x86/include
|
241 |
|
241 |
|
242 |
LIBS += $$EXT_LIB_PATH/skia/x86/libskia.a \
|
242 |
LIBS += $$EXT_LIB_PATH/skia/x86/libskia.a \
|
243 |
-L$$SDK_PATH/android_openssl/no-asm/latest/x86 \
|
243 |
-L$$SDK_PATH/android_openssl/no-asm/latest/x86 \
|
244 |
$$EXT_LIB_PATH/pjsip/lib/libpj-i686-pc-linux-android.a \
|
244 |
$$EXT_LIB_PATH/pjsip/lib/libpj-i686-pc-linux-android.a \
|
245 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-i686-pc-linux-android.a \
|
245 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-i686-pc-linux-android.a \
|
Line 258... |
Line 258... |
258 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-i686-pc-linux-android.a \
|
258 |
$$EXT_LIB_PATH/pjsip/lib/libwebrtc-i686-pc-linux-android.a \
|
259 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-i686-pc-linux-android.a
|
259 |
$$EXT_LIB_PATH/pjsip/lib/libilbccodec-i686-pc-linux-android.a
|
260 |
}
|
260 |
}
|
261 |
|
261 |
|
262 |
equals(ANDROID_TARGET_ARCH,x86_64) {
|
262 |
equals(ANDROID_TARGET_ARCH,x86_64) {
|
263 |
INCLUDEPATH += $$EXT_LIB_PATH/openssl/x86_64/include
|
263 |
# INCLUDEPATH += $$EXT_LIB_PATH/openssl/x86_64/include
|
264 |
|
264 |
|
265 |
LIBS += $$EXT_LIB_PATH/skia/x86_64/libskia.a \
|
265 |
LIBS += $$EXT_LIB_PATH/skia/x86_64/libskia.a \
|
266 |
-L$$SDK_PATH/android_openssl/no-asm/latest/x86_64 \
|
266 |
-L$$SDK_PATH/android_openssl/no-asm/latest/x86_64 \
|
267 |
$$EXT_LIB_PATH/pjsip/lib/libpj-x86_64-pc-linux-android.a \
|
267 |
$$EXT_LIB_PATH/pjsip/lib/libpj-x86_64-pc-linux-android.a \
|
268 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-x86_64-pc-linux-android.a \
|
268 |
$$EXT_LIB_PATH/pjsip/lib/libpjlib-util-x86_64-pc-linux-android.a \
|
Line 355... |
Line 355... |
355 |
download.ui \
|
355 |
download.ui \
|
356 |
wait.ui
|
356 |
wait.ui
|
357 |
|
357 |
|
358 |
android: {
|
358 |
android: {
|
359 |
INCLUDEPATH += $$(QTDIR)/include/QtGui/$$QT_VERSION/QtGui
|
359 |
INCLUDEPATH += $$(QTDIR)/include/QtGui/$$QT_VERSION/QtGui
|
360 |
LIBS += -lcrypto_1_1 -lssl_1_1 -lEGL -landroid -lmediandk
|
360 |
LIBS += -lEGL -landroid -lmediandk
|
361 |
|
361 |
|
362 |
DISTFILES += \
|
362 |
DISTFILES += \
|
363 |
android/AndroidManifest.xml \
|
363 |
android/AndroidManifest.xml \
|
364 |
android/build.gradle \
|
364 |
android/build.gradle \
|
365 |
android/gradle.properties \
|
365 |
android/gradle.properties \
|
Line 375... |
Line 375... |
375 |
android/res/values/themes.xml
|
375 |
android/res/values/themes.xml
|
376 |
|
376 |
|
377 |
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
377 |
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
378 |
CONFIG += sdk_no_version_check
|
378 |
CONFIG += sdk_no_version_check
|
379 |
# Add openSSL library for Android
|
379 |
# Add openSSL library for Android
|
- |
|
380 |
if (versionAtLeast(QT_VERSION, 6.5.0)) {
|
- |
|
381 |
ANDROID_EXTRA_LIBS += \
|
- |
|
382 |
$$SSL_PATH/ssl_3/$$ANDROID_TARGET_ARCH/libcrypto_3.so \
|
- |
|
383 |
$$SSL_PATH/ssl_3/$$ANDROID_TARGET_ARCH/libssl_3.so
|
380 |
include($$SDK_PATH/android_openssl/openssl.pri)
|
384 |
INCLUDEPATH += $$SSL_PATH/ssl_3/include
|
- |
|
385 |
LIBS += -L$$SSL_PATH/ssl_3/$$ANDROID_TARGET_ARCH -lcrypto -lssl
|
- |
|
386 |
} else {
|
- |
|
387 |
ANDROID_EXTRA_LIBS += \
|
- |
|
388 |
$$SSL_PATH/ssl_1.1/$$ANDROID_TARGET_ARCH/libcrypto_1_1.so \
|
- |
|
389 |
$$SSL_PATH/ssl_1.1/$$ANDROID_TARGET_ARCH/libssl_1_1.so
|
- |
|
390 |
INCLUDEPATH += $$SSL_PATH/ssl_1.1/include
|
- |
|
391 |
LIBS += -L$$SSL_PATH/ssl_1.1/$$ANDROID_TARGET_ARCH -lcrypto -lssl
|
- |
|
392 |
}
|
381 |
} else {
|
393 |
} else {
|
382 |
LIBS += -lcrypto -lssl -liconv
|
394 |
LIBS += -lcrypto -lssl -liconv
|
383 |
}
|
395 |
}
|
384 |
|
396 |
|
385 |
# Add the ftp library
|
397 |
# Add the ftp library
|
386 |
DEPENDPATH += $$PWD/ftplib
|
398 |
DEPENDPATH += $$PWD/ftplib
|
387 |
|
- |
|
388 |
ANDROID_EXTRA_LIBS = /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/arm64-v8a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libssl_1_1.so /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/arm64-v8a/libssl_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libssl_1_1.so /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/x86_64/libcrypto_1_1.so /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/x86_64/libssl_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libssl_1_1.so /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/x86/libcrypto_1_1.so /home/andreas/projects/tpanel/../../Android/openssl/ssl_1.1/x86/libssl_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libssl_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libcrypto_1_1.so /home/andreas/Android/openssl/ssl_1.1/armeabi-v7a/libssl_1_1.so
|
- |
|