From 23ee2ddc2bd6cb64ea34aa74bcfb7ecae06768ee Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Fri, 23 Jul 2021 18:44:42 +0300
Subject: [PATCH] fix build

---
 CMakeLists.txt            | 22 ----------------------
 src/Client/CMakeLists.txt | 27 ++++++++++++++++++---------
 submodules/QuasarAppLib   |  2 +-
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c20126c..0b453c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,28 +15,6 @@ endif()
 
 if (ANDROID)
     set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Client/android")
-
-    set(ARG_DEPENDS
-        ${PROJECT_NAME}Core
-        TestLvl
-        AbstractLvl
-        JungleLvl
-        QuasarApp
-        QmlNotyfyService
-        ViewSolutions)
-
-    set(ANDROID_EXTRA_CRAWL_LIBS_DIR "${CMAKE_BINARY_DIR}/extraLibs/")
-    make_directory(${ANDROID_EXTRA_CRAWL_LIBS_DIR})
-
-    foreach(LIB ${ARG_DEPENDS})
-        ADD_CUSTOM_TARGET(
-            copyExtraAPKLib${LIB} ALL
-            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${LIB}>" ${ANDROID_EXTRA_CRAWL_LIBS_DIR}
-            COMMENT ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${LIB}>" ${ANDROID_EXTRA_CRAWL_LIBS_DIR}
-        )
-
-        set(ANDROID_EXTRA_LIBS ${ANDROID_EXTRA_LIBS} "${ANDROID_EXTRA_CRAWL_LIBS_DIR}/lib${LIB}.so")
-    endforeach()
 endif()
 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt
index fcd19a9..d7fccb0 100644
--- a/src/Client/CMakeLists.txt
+++ b/src/Client/CMakeLists.txt
@@ -32,18 +32,27 @@ file(MAKE_DIRECTORY ${TARGET_DIR})
 
 if (ANDROID)
 
+    set(SNAKE_EXTRA_LIBS
+        ${PROJECT_NAME}Core
+        TestLvl
+        AbstractLvl
+        JungleLvl
+        QuasarApp
+        QmlNotyfyService
+        ViewSolutions)
+
 #    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
-
-#    addDeployAPK(${CURRENT_PROJECT}
-#                "${CMAKE_CURRENT_LIST_DIR}/android"
-#                "SnakeProject"
-#                "${SIGPATH}/Crawl.keystore"
-#                "${SIGPASS_SNAKE}"
-#                "${TARGET_DIR}"
-#                "${SNAKE_EXTRA_LIBS}")
-
 #    target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
 
+    addDeployAPK(${CURRENT_PROJECT}
+                "${CMAKE_CURRENT_LIST_DIR}/android"
+                "SnakeProject"
+                "${SIGPATH}/Crawl.keystore"
+                "${SIGPASS_SNAKE}"
+                "${TARGET_DIR}"
+                "${SNAKE_EXTRA_LIBS}")
+
+
     file(GLOB java_files
        "android/src/com/quasarapp/androidtools/*.java"
        "android/*.xml"
diff --git a/submodules/QuasarAppLib b/submodules/QuasarAppLib
index cd84e72..dee8b58 160000
--- a/submodules/QuasarAppLib
+++ b/submodules/QuasarAppLib
@@ -1 +1 @@
-Subproject commit cd84e724844fcdd0bc3e2c7887fe0c7574dfd6ee
+Subproject commit dee8b58fd8b80aac3f54efcbb65a7b3c540a24a8