CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: lib name for android build

This commit is contained in:
Hamed Masafi 2020-07-29 09:57:11 +04:30
parent 46dd164618
commit bd0643b920
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/serializer vendored

@ -1 +1 @@
Subproject commit 5b30b13af9b9537d4226c922d04106dc4ba0595b Subproject commit 75807feeb3cbc9dcae313cca7541e6011625b19f

18
test/common/nut-lib.pri
View File

@ -1,8 +1,26 @@
win32 { win32 {
CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug) CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug)
CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/release) CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/release)
LIBS += -L$$LIBDIR -lnut
} else { } else {
LIBDIR = $$absolute_path($$OUT_PWD/../../src) 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 LIBS += -L$$LIBDIR -lnut