From 5ebf6d6345f3327aadad23b5a6daa99aef5fc43c Mon Sep 17 00:00:00 2001
From: Hamed Masafi <hamed.masafi@gmail.com>
Date: Wed, 29 Jul 2020 11:04:41 +0430
Subject: [PATCH] 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
---
 .github/workflows/qt.yml |  7 +++++--
 3rdparty/serializer      |  2 +-
 test/common/nut-lib.pri  | 19 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml
index fa162c3..1f1c5e4 100644
--- a/.github/workflows/qt.yml
+++ b/.github/workflows/qt.yml
@@ -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
diff --git a/3rdparty/serializer b/3rdparty/serializer
index 5b30b13..0e794d6 160000
--- a/3rdparty/serializer
+++ b/3rdparty/serializer
@@ -1 +1 @@
-Subproject commit 5b30b13af9b9537d4226c922d04106dc4ba0595b
+Subproject commit 0e794d6317595d077e95e8a06f1f3a8c92543b05
diff --git a/test/common/nut-lib.pri b/test/common/nut-lib.pri
index d8b2f31..50d93a8 100644
--- a/test/common/nut-lib.pri
+++ b/test/common/nut-lib.pri
@@ -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