diff --git a/samples/CMakeLists.txt b/samples/cmake/CMakeLists.txt similarity index 74% rename from samples/CMakeLists.txt rename to samples/cmake/CMakeLists.txt index 1f6f3a9..aefae08 100644 --- a/samples/CMakeLists.txt +++ b/samples/cmake/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.2) -set(CMAKE_TOOLCHAIN_FILE $ENV{WUT_ROOT}/share/wut.toolchain.cmake) +set(CMAKE_TOOLCHAIN_FILE $ENV{DEVKITPRO}/wut/share/wut.toolchain.cmake) project(samples) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_subdirectory(curl) add_subdirectory(custom_default_heap) diff --git a/samples/content/README.txt b/samples/cmake/content/README.txt similarity index 100% rename from samples/content/README.txt rename to samples/cmake/content/README.txt diff --git a/samples/content/pos_col_shader.gsh b/samples/cmake/content/pos_col_shader.gsh similarity index 100% rename from samples/content/pos_col_shader.gsh rename to samples/cmake/content/pos_col_shader.gsh diff --git a/samples/content/pos_col_shader.psh b/samples/cmake/content/pos_col_shader.psh similarity index 100% rename from samples/content/pos_col_shader.psh rename to samples/cmake/content/pos_col_shader.psh diff --git a/samples/content/pos_col_shader.vsh b/samples/cmake/content/pos_col_shader.vsh similarity index 100% rename from samples/content/pos_col_shader.vsh rename to samples/cmake/content/pos_col_shader.vsh diff --git a/samples/curl/CMakeLists.txt b/samples/cmake/curl/CMakeLists.txt similarity index 85% rename from samples/curl/CMakeLists.txt rename to samples/cmake/curl/CMakeLists.txt index e4dd5bd..2d3b5e4 100644 --- a/samples/curl/CMakeLists.txt +++ b/samples/cmake/curl/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(curl C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(curl main.c) diff --git a/samples/curl/main.c b/samples/cmake/curl/main.c similarity index 100% rename from samples/curl/main.c rename to samples/cmake/curl/main.c diff --git a/samples/custom_default_heap/CMakeLists.txt b/samples/cmake/custom_default_heap/CMakeLists.txt similarity index 89% rename from samples/custom_default_heap/CMakeLists.txt rename to samples/cmake/custom_default_heap/CMakeLists.txt index a3de174..bf1f6bd 100644 --- a/samples/custom_default_heap/CMakeLists.txt +++ b/samples/cmake/custom_default_heap/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(custom_default_heap C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(custom_default_heap main.c) diff --git a/samples/custom_default_heap/exports.def b/samples/cmake/custom_default_heap/exports.def similarity index 100% rename from samples/custom_default_heap/exports.def rename to samples/cmake/custom_default_heap/exports.def diff --git a/samples/custom_default_heap/main.c b/samples/cmake/custom_default_heap/main.c similarity index 100% rename from samples/custom_default_heap/main.c rename to samples/cmake/custom_default_heap/main.c diff --git a/samples/gx2_triangle/CMakeLists.txt b/samples/cmake/gx2_triangle/CMakeLists.txt similarity index 86% rename from samples/gx2_triangle/CMakeLists.txt rename to samples/cmake/gx2_triangle/CMakeLists.txt index 231f3d5..fcd4114 100644 --- a/samples/gx2_triangle/CMakeLists.txt +++ b/samples/cmake/gx2_triangle/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(gx2_triangle C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(gx2_triangle main.c) diff --git a/samples/gx2_triangle/main.c b/samples/cmake/gx2_triangle/main.c similarity index 100% rename from samples/gx2_triangle/main.c rename to samples/cmake/gx2_triangle/main.c diff --git a/samples/helloworld/CMakeLists.txt b/samples/cmake/helloworld/CMakeLists.txt similarity index 85% rename from samples/helloworld/CMakeLists.txt rename to samples/cmake/helloworld/CMakeLists.txt index 7fe9844..e5a5d20 100644 --- a/samples/helloworld/CMakeLists.txt +++ b/samples/cmake/helloworld/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(helloworld C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(helloworld main.c) diff --git a/samples/helloworld/main.c b/samples/cmake/helloworld/main.c similarity index 100% rename from samples/helloworld/main.c rename to samples/cmake/helloworld/main.c diff --git a/samples/helloworld_cpp/CMakeLists.txt b/samples/cmake/helloworld_cpp/CMakeLists.txt similarity index 90% rename from samples/helloworld_cpp/CMakeLists.txt rename to samples/cmake/helloworld_cpp/CMakeLists.txt index 5c8496a..7bac5e2 100644 --- a/samples/helloworld_cpp/CMakeLists.txt +++ b/samples/cmake/helloworld_cpp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(helloworld_cpp CXX) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(helloworld_cpp main.cpp) diff --git a/samples/helloworld_cpp/main.cpp b/samples/cmake/helloworld_cpp/main.cpp similarity index 100% rename from samples/helloworld_cpp/main.cpp rename to samples/cmake/helloworld_cpp/main.cpp diff --git a/samples/my_first_rpl/CMakeLists.txt b/samples/cmake/my_first_rpl/CMakeLists.txt similarity index 85% rename from samples/my_first_rpl/CMakeLists.txt rename to samples/cmake/my_first_rpl/CMakeLists.txt index dd8e047..afcebab 100644 --- a/samples/my_first_rpl/CMakeLists.txt +++ b/samples/cmake/my_first_rpl/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(my_first_rpl C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(my_first_rpl my_first_rpl.c) diff --git a/samples/my_first_rpl/exports.def b/samples/cmake/my_first_rpl/exports.def similarity index 100% rename from samples/my_first_rpl/exports.def rename to samples/cmake/my_first_rpl/exports.def diff --git a/samples/my_first_rpl/my_first_rpl.c b/samples/cmake/my_first_rpl/my_first_rpl.c similarity index 100% rename from samples/my_first_rpl/my_first_rpl.c rename to samples/cmake/my_first_rpl/my_first_rpl.c diff --git a/samples/swkbd/CMakeLists.txt b/samples/cmake/swkbd/CMakeLists.txt similarity index 88% rename from samples/swkbd/CMakeLists.txt rename to samples/cmake/swkbd/CMakeLists.txt index 44ad754..e64457c 100644 --- a/samples/swkbd/CMakeLists.txt +++ b/samples/cmake/swkbd/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(swkbd CXX) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(swkbd main.cpp) diff --git a/samples/swkbd/main.cpp b/samples/cmake/swkbd/main.cpp similarity index 100% rename from samples/swkbd/main.cpp rename to samples/cmake/swkbd/main.cpp