QuasarApp/Snake
4
1
Fork 0
mirror of https://github.com/QuasarApp/Snake.git synced 2025-04-26 17:54:42 +00:00
Code Issues Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Andrei Yankovich 2021-07-23 18:44:42 +03:00
parent cbed64116f
commit 23ee2ddc2b
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -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)

27
src/Client/CMakeLists.txt
View File

@ -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"

2
submodules/QuasarAppLib

@ -1 +1 @@
Subproject commit cd84e724844fcdd0bc3e2c7887fe0c7574dfd6ee
Subproject commit dee8b58fd8b80aac3f54efcbb65a7b3c540a24a8