From e08ce7239c3b25d54f91e4edd61f3fe96f2cbb1c Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Mon, 1 Aug 2016 19:25:14 +0100 Subject: [PATCH] Android build fixes --- renderdoc/driver/vulkan/CMakeLists.txt | 2 +- renderdoccmd/renderdoccmd_android.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/vulkan/CMakeLists.txt b/renderdoc/driver/vulkan/CMakeLists.txt index 8a3d7bcc7..67704fc78 100644 --- a/renderdoc/driver/vulkan/CMakeLists.txt +++ b/renderdoc/driver/vulkan/CMakeLists.txt @@ -41,7 +41,7 @@ set(sources set(definitions ${RDOC_DEFINITIONS}) if(ANDROID) - list(APPEND sources vk_posix.cpp vk_android.cpp) + list(APPEND sources vk_posix.cpp vk_android.cpp vk_tracelayer_android.cpp) list(APPEND definitions PRIVATE -DVK_USE_PLATFORM_ANDROID_KHR) elseif(UNIX) list(APPEND sources vk_posix.cpp vk_linux.cpp) diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp index c642c5ac2..cdca7a633 100644 --- a/renderdoccmd/renderdoccmd_android.cpp +++ b/renderdoccmd/renderdoccmd_android.cpp @@ -77,11 +77,11 @@ void handle_cmd(android_app *app, int32_t cmd) __android_log_print(ANDROID_LOG_INFO, LOGCAT_TAG, "APP_CMD_INIT_WINDOW: android_state->window: %p", android_state->window); - char *argv[] = { + const char *argv[] = { "renderdoccmd", "/sdcard/capture.rdc", }; int argc = sizeof(argv) / sizeof(argv[0]); - renderdoccmd(argc, argv); + renderdoccmd(argc, (char **)argv); break; } case APP_CMD_TERM_WINDOW: