mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
android deploy fix attempt
This commit is contained in:
parent
be58f61c35
commit
90931cc3e3
@ -405,15 +405,7 @@ if(APPLE_IOS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
assign_source_group(${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS})
|
assign_source_group(${vcmiclientcommon_SRCS} ${vcmiclientcommon_HEADERS})
|
||||||
|
add_library(vcmiclientcommon STATIC ${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()
|
|
||||||
|
|
||||||
if(NOT ENABLE_STATIC_LIBS)
|
if(NOT ENABLE_STATIC_LIBS)
|
||||||
add_dependencies(vcmiclientcommon
|
add_dependencies(vcmiclientcommon
|
||||||
|
@ -22,7 +22,15 @@ if(APPLE_IOS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
assign_source_group(${clientapp_SRCS} ${clientapp_HEADERS})
|
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)
|
target_link_libraries(vcmiclient PRIVATE vcmiclientcommon)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user