From d395da86442ce8d9194222fdf45d5b5ef8b90163 Mon Sep 17 00:00:00 2001 From: Marty <85036874+MatusGuy@users.noreply.github.com> Date: Tue, 9 Jan 2024 20:57:28 +0000 Subject: [PATCH] data.zip is made by cmake --- CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a8374a65d..1dbb0aa36a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,20 +324,12 @@ include(SuperTux/BuildInstall) ## Create config.h now that INSTALL_SUBDIR_* have been set. configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h ) -#[[ -## Configure main menu logo -if(("${SUPERTUX_VERSION_STRING}" MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$") OR IS_SUPERTUX_RELEASE OR STEAM_BUILD) - set(LOGO_FILE "logo_final.sprite") -else() - set(LOGO_FILE "logo.sprite") -endif() -configure_file(data/levels/misc/menu.stl.in ${CMAKE_BINARY_DIR}/data/levels/misc/menu.stl ) +# Make android data.zip if(ANDROID) get_filename_component(DATADIR ${PROJECT_SOURCE_DIR}/data REALPATH) if(NOT EXISTS ${PROJECT_SOURCE_DIR}/build.android/app/src/main/assets) file(MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/build.android/app/src/main/assets) endif() - file(COPY_FILE ${CMAKE_BINARY_DIR}/data/levels/misc/menu.stl ${DATADIR}/levels/misc/menu.stl) file(GLOB DATA_CONTENTS RELATIVE ${DATADIR} ${DATADIR}/*) message("DATA: ${DATA_CONTENTS}") #file(ARCHIVE_CREATE OUTPUT ${PROJECT_SOURCE_DIR}/build.android/app/src/main/assets/data.zip PATHS ${DATA_CONTENTS} FORMAT zip) @@ -349,7 +341,6 @@ if(ANDROID) WORKING_DIRECTORY ${DATADIR} ) endif() -#]] ## Build tests include(SuperTux/BuildTests)