mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	android deploy fix attempt
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user