File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ include (${CMAKE_CURRENT_LIST_DIR}/../yup_utilities.cmake)
2626function (_yup_android_prepare_gradle )
2727 set (options "" )
2828 set (one_value_args
29- MIN_SDK_VERSION COMPILE_SDK_VERSION TARGET_SDK_VERSION
29+ BASE_PATH MIN_SDK_VERSION COMPILE_SDK_VERSION TARGET_SDK_VERSION
3030 TARGET_NAME TARGET_ICON ABI TOOLCHAIN PLATFORM STL CPP_VERSION CMAKE_VERSION
3131 APPLICATION_ID APPLICATION_NAMESPACE APPLICATION_CMAKELISTS_PATH APPLICATION_VERSION)
3232 set (multi_value_args "" )
@@ -54,7 +54,7 @@ function (_yup_android_prepare_gradle)
5454 file (RELATIVE_PATH YUP_ANDROID_APPLICATION_PATH "${CMAKE_CURRENT_BINARY_DIR} /app" "${YUP_ANDROID_APPLICATION_PATH} " )
5555
5656 # Prepare files
57- set (BASE_FILES_PATH "${CMAKE_CURRENT_FUNCTION_LIST_DIR } /android" )
57+ set (BASE_FILES_PATH "${YUP_ANDROID_BASE_PATH } /android" )
5858 configure_file (${BASE_FILES_PATH} /build.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR} /build.gradle.kts )
5959 configure_file (${BASE_FILES_PATH} /settings.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR} /settings.gradle.kts )
6060 configure_file (${BASE_FILES_PATH} /app/build.gradle.kts.in ${CMAKE_CURRENT_BINARY_DIR} /app/build.gradle.kts )
Original file line number Diff line number Diff line change @@ -63,11 +63,12 @@ function (yup_standalone_app)
6363 if (YUP_TARGET_ANDROID)
6464 _yup_message (STATUS "${target_name} - Creating java gradle project" )
6565 _yup_android_prepare_gradle (
66- TARGET_NAME ${target_name}
67- TARGET_ICON ${target_icon}
68- APPLICATION_ID ${target_app_identifier}
69- APPLICATION_NAMESPACE ${target_app_namespace}
70- APPLICATION_VERSION ${target_version} )
66+ BASE_PATH "${CMAKE_CURRENT_FUNCTION_LIST_DIR} "
67+ TARGET_NAME "${target_name} "
68+ TARGET_ICON "${target_icon} "
69+ APPLICATION_ID "${target_app_identifier} "
70+ APPLICATION_NAMESPACE "${target_app_namespace} "
71+ APPLICATION_VERSION "${target_version} " )
7172
7273 _yup_message (STATUS "${target_name} - Copying SDL2 java activity to application" )
7374 _yup_fetch_sdl2 ()
You can’t perform that action at this time.
0 commit comments