From ea9816ce41cad25e2323da0d1ad178b7fe8a319d Mon Sep 17 00:00:00 2001 From: staphen Date: Sun, 12 Sep 2021 22:40:19 -0400 Subject: [PATCH] Enable virtual gamepad for Android --- android-project/.gitignore | 1 + android-project/CMake/android_defs.cmake | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/android-project/.gitignore b/android-project/.gitignore index ca9011ccf..75fb9aeb2 100644 --- a/android-project/.gitignore +++ b/android-project/.gitignore @@ -13,3 +13,4 @@ build/ /app/src/main/assets/CharisSILB.ttf /app/src/main/assets/*.gmo +/app/src/main/assets/ui_art/* diff --git a/android-project/CMake/android_defs.cmake b/android-project/CMake/android_defs.cmake index 013b2204b..ee0ccc3d0 100644 --- a/android-project/CMake/android_defs.cmake +++ b/android-project/CMake/android_defs.cmake @@ -4,6 +4,7 @@ set(UBSAN OFF) set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF) set(DEVILUTIONX_SYSTEM_LIBPNG OFF) set(DISABLE_ZERO_TIER ON) +set(VIRTUAL_GAMEPAD ON) if(BINARY_RELEASE OR CMAKE_BUILD_TYPE STREQUAL "Release") # Workaroudn linker bug in CLang: https://github.com/android/ndk/issues/721 @@ -16,3 +17,6 @@ set(TTF_FONT_DIR \"\") file( COPY "${DevilutionX_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf" DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets") + +file(GLOB VirtualGamepadArt "${DevilutionX_SOURCE_DIR}/Packaging/resources/ui_art/*") +file(COPY ${VirtualGamepadArt} DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets/ui_art")