Compare commits

..

No commits in common. "cb86e30fab5eb0dbadc94d61869e9151ff72ebf0" and "672de3919bd20331945295018f9c5b9686db4b12" have entirely different histories.

2 changed files with 4 additions and 20 deletions

View File

@ -41,14 +41,7 @@ jobs:
version: '6.4.0' version: '6.4.0'
target: 'android' target: 'android'
arch: 'android_arm64_v8a' arch: 'android_arm64_v8a'
- name: Install Android Google Protocol Buffers
run: git clone https://github.com/tumic0/android_protobuf.git
- name: Configure build - name: Configure build
run: qmake pbfplugin.pro PROTOBUF=android_protobuf run: qmake pbfplugin.pro
- name: Build project - name: Build project
run: make -j2 run: make -j2
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: libplugins_imageformats_libpbf_arm64-v8a.so
path: plugins/libpbf/libplugins_imageformats_libpbf_arm64-v8a.so

View File

@ -39,12 +39,9 @@ RESOURCES += pbfplugin.qrc
DEFINES += QT_NO_DEPRECATED_WARNINGS DEFINES += QT_NO_DEPRECATED_WARNINGS
unix:!macx:!android { unix:!macx{
LIBS += -lprotobuf-lite \ LIBS += -lprotobuf-lite \
-lz -lz
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
INSTALLS += target
} }
win32 { win32 {
INCLUDEPATH += $$PROTOBUF/include \ INCLUDEPATH += $$PROTOBUF/include \
@ -61,12 +58,6 @@ macx {
LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \ LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \
-lz -lz
} }
android {
INCLUDEPATH += $$PROTOBUF/include
LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \
-lz
top_builddir=$$shadowed($$PWD) target.path += $$[QT_INSTALL_PLUGINS]/imageformats
DESTDIR = $$top_builddir/plugins/libpbf INSTALLS += target
TARGET = $$qt5LibraryTarget(libpbf, "plugins/imageformats/")
}