From 9a0930e5b34f96604a9eb59ded7c5b7633cf815a Mon Sep 17 00:00:00 2001 From: James Benton Date: Thu, 31 May 2018 10:30:24 +0100 Subject: [PATCH] Add install for samples/content. --- samples/CMakeLists.txt | 6 ++++++ samples/content/README.txt | 3 +++ samples/gx2_triangle/main.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 samples/content/README.txt diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 9652053..e948c76 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -2,5 +2,11 @@ cmake_minimum_required(VERSION 3.2) project(samples) include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +add_subdirectory(custom_default_heap) add_subdirectory(helloworld) add_subdirectory(helloworld_std_thread) +add_subdirectory(gx2_triangle) +add_subdirectory(my_first_rpl) + +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/content/" + DESTINATION "${CMAKE_INSTALL_PREFIX}/content") diff --git a/samples/content/README.txt b/samples/content/README.txt new file mode 100644 index 0000000..cff48a2 --- /dev/null +++ b/samples/content/README.txt @@ -0,0 +1,3 @@ +Samples assume that this content directory is copied to /sdcard/wut/content + +e.g. For gx2_triangle /sdcard/wut/content/pos_col_shader.gsh must exist! diff --git a/samples/gx2_triangle/main.c b/samples/gx2_triangle/main.c index 4802b72..5f43a4d 100644 --- a/samples/gx2_triangle/main.c +++ b/samples/gx2_triangle/main.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) } sdRootPath = WHBGetSdCardMountPath(); - sprintf(path, "%s/wut/pos_col_shader.gsh", sdRootPath); + sprintf(path, "%s/wut/content/pos_col_shader.gsh", sdRootPath); gshFileData = WHBReadWholeFile(path, NULL); if (!gshFileData) {