mirror of
https://github.com/tumic0/QtPBFImagePlugin.git
synced 2024-11-24 03:35:54 +01:00
Added Google Protocol Buffers to Android build
This commit is contained in:
parent
672de3919b
commit
dbcfd9b9d3
4
.github/workflows/android.yml
vendored
4
.github/workflows/android.yml
vendored
@ -41,7 +41,9 @@ 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
|
run: qmake pbfplugin.pro PROTOBUF=android_protobuf
|
||||||
- name: Build project
|
- name: Build project
|
||||||
run: make -j2
|
run: make -j2
|
||||||
|
@ -39,7 +39,7 @@ RESOURCES += pbfplugin.qrc
|
|||||||
|
|
||||||
DEFINES += QT_NO_DEPRECATED_WARNINGS
|
DEFINES += QT_NO_DEPRECATED_WARNINGS
|
||||||
|
|
||||||
unix:!macx{
|
unix:!macx:!android {
|
||||||
LIBS += -lprotobuf-lite \
|
LIBS += -lprotobuf-lite \
|
||||||
-lz
|
-lz
|
||||||
}
|
}
|
||||||
@ -58,6 +58,11 @@ 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
|
||||||
|
}
|
||||||
|
|
||||||
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
Loading…
Reference in New Issue
Block a user