From 90931cc3e3934dea916bcce32bec7fe70e613e25 Mon Sep 17 00:00:00 2001 From: Simeon Manolov Date: Mon, 19 Aug 2024 13:17:38 +0300 Subject: [PATCH] android deploy fix attempt --- client/CMakeLists.txt | 10 +--------- clientapp/CMakeLists.txt | 10 +++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 09a69f858..7419370d3 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -405,15 +405,7 @@ if(APPLE_IOS) endif() assign_source_group(${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS}) - -if(ANDROID) - add_library(vcmiclientcommon SHARED ${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS}) - set_target_properties(vcmiclientcommon PROPERTIES - OUTPUT_NAME "vcmiclient_${ANDROID_ABI}" # required by Qt - ) -else() - add_library(vcmiclientcommon STATIC ${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS}) -endif() +add_library(vcmiclientcommon STATIC ${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS}) if(NOT ENABLE_STATIC_LIBS) add_dependencies(vcmiclientcommon diff --git a/clientapp/CMakeLists.txt b/clientapp/CMakeLists.txt index 2e9e586cb..8ed148e3f 100644 --- a/clientapp/CMakeLists.txt +++ b/clientapp/CMakeLists.txt @@ -22,7 +22,15 @@ if(APPLE_IOS) endif() assign_source_group(${clientapp_SRCS} ${clientapp_HEADERS}) -add_executable(vcmiclient ${clientapp_SRCS} ${clientapp_HEADERS}) + +if(ANDROID) + add_library(vcmiclient SHARED ${clientapp_SRCS} ${clientapp_HEADERS}) + set_target_properties(vcmiclient PROPERTIES + OUTPUT_NAME "vcmiclient_${ANDROID_ABI}" # required by Qt + ) +else() + add_executable(vcmiclient ${clientapp_SRCS} ${clientapp_HEADERS}) +endif() target_link_libraries(vcmiclient PRIVATE vcmiclientcommon)