merge build success into master (#106)

* fix: lib name for android build

* restore back ios build in actions

* update serializer submodule

* fix: extra libs declartion in android build
This commit is contained in:
Hamed Masafi 2020-07-29 11:04:41 +04:30 committed by GitHub
parent 4a728600ad
commit 5ebf6d6345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions

View File

@ -20,7 +20,8 @@ jobs:
- mingw81_64
- mingw81_32
- clang_64
- ios
include:
- platform: gcc_64
os: ubuntu-latest
@ -42,7 +43,9 @@ jobs:
os: windows-latest
- platform: clang_64
os: macos-latest
- platform: ios
os: macos-latest
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v1

2
3rdparty/serializer vendored

@ -1 +1 @@
Subproject commit 5b30b13af9b9537d4226c922d04106dc4ba0595b
Subproject commit 0e794d6317595d077e95e8a06f1f3a8c92543b05

View File

@ -1,11 +1,28 @@
win32 {
CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug)
CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/release)
LIBS += -L$$LIBDIR -lnut
} else {
LIBDIR = $$absolute_path($$OUT_PWD/../../src)
android: {
contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
LIBS += -L$$LIBDIR -lnut_armeabi-v7a
}
contains(ANDROID_TARGET_ARCH,arm64-v8a) {
LIBS += -L$$LIBDIR -lnut_arm64-v8a
}
contains(ANDROID_TARGET_ARCH,x86) {
LIBS += -L$$LIBDIR -lnut_x86
}
contains(ANDROID_TARGET_ARCH,x86_64) {
LIBS += -L$$LIBDIR -lnut_x86_64
}
} else {
LIBS += -L$$LIBDIR -lnut
}
}
LIBS += -L$$LIBDIR -lnut
INCLUDEPATH += $$PWD/../../src $$PWD/../common
DEFINES += NUT_SHARED_POINTER