diff --git a/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml index b6857e0..27552d0 100644 --- a/android-sources/AndroidManifest.xml +++ b/android-sources/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/android-sources/libs/armeabi-v7a/libcrypto.so b/android-sources/libs/armeabi-v7a/libcrypto.so old mode 100644 new mode 100755 index 4448d85..329f621 Binary files a/android-sources/libs/armeabi-v7a/libcrypto.so and b/android-sources/libs/armeabi-v7a/libcrypto.so differ diff --git a/android-sources/libs/armeabi-v7a/libcrypto.so.1.1 b/android-sources/libs/armeabi-v7a/libcrypto.so.1.1 deleted file mode 100755 index 329f621..0000000 Binary files a/android-sources/libs/armeabi-v7a/libcrypto.so.1.1 and /dev/null differ diff --git a/android-sources/libs/armeabi-v7a/libssl.so b/android-sources/libs/armeabi-v7a/libssl.so old mode 100644 new mode 100755 index e8ef374..473775f Binary files a/android-sources/libs/armeabi-v7a/libssl.so and b/android-sources/libs/armeabi-v7a/libssl.so differ diff --git a/android-sources/libs/armeabi-v7a/libssl.so.1.0.0 b/android-sources/libs/armeabi-v7a/libssl.so.1.0.0 deleted file mode 100644 index e8ef374..0000000 Binary files a/android-sources/libs/armeabi-v7a/libssl.so.1.0.0 and /dev/null differ diff --git a/android-sources/libs/armeabi-v7a/libssl.so.1.1 b/android-sources/libs/armeabi-v7a/libssl.so.1.1 deleted file mode 100755 index 473775f..0000000 Binary files a/android-sources/libs/armeabi-v7a/libssl.so.1.1 and /dev/null differ diff --git a/fannyapp.pro b/fannyapp.pro index 2900c19..464ecc8 100644 --- a/fannyapp.pro +++ b/fannyapp.pro @@ -18,7 +18,6 @@ TEMPLATE = app TARGET = fannyapp ICON = shared/graphics/favicon.icns -RC_ICONS = shared/graphics/favicon.ico SOURCES += \ sources/serverconn.cpp \ @@ -55,10 +54,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin android { QT += androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources - LIBS += "$$PWD/android-sources/libs/armeabi-v7a/libssl.a" - LIBS += "$$PWD/android-sources/libs/armeabi-v7a/libcrypto.a" } + win { + RC_ICONS = shared/graphics/favicon.ico LIBS += "$$PWD/windows-libs/libeay32.dll" LIBS += "$$PWD/windows-libs/ssleay32.dll" } @@ -69,7 +68,5 @@ ios { DISTFILES += \ android-sources/AndroidManifest.xml \ - CHANGELOG.md \ - $$files(shared/icons/*.png, true) \ - shared/icons/ibmaterial/index.theme + CHANGELOG.md