diff --git a/CMakeLists.txt b/CMakeLists.txt index 38ce8ef1..b6e1f3aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -779,7 +779,7 @@ if(NINTENDO_3DS) DESCRIPTION "LEGO Island for the Nintendo 3DS" AUTHOR "isledecomp/isle-portable" VERSION "${PROJECT_VERSION}" - ICON "ISLE/res/3ds/icon.png" + ICON "${CMAKE_SOURCE_DIR}/packaging/3ds/icon.png" ) ctr_create_3dsx(isle SMDH isle.smdh) @@ -787,10 +787,10 @@ if(NINTENDO_3DS) add_custom_command( OUTPUT "isle.bnr" COMMAND "${BANNERTOOL}" makebanner - -i "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png" - -a "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav" + -i "${CMAKE_SOURCE_DIR}/packaging/3ds/banner.png" + -a "${CMAKE_SOURCE_DIR}/packaging/3ds/banner.wav" -o "isle.bnr" - DEPENDS "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png" "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav" + DEPENDS "${CMAKE_SOURCE_DIR}/packaging/3ds/banner.png" "${CMAKE_SOURCE_DIR}/packaging/3ds/banner.wav" VERBATIM ) @@ -800,14 +800,14 @@ if(NINTENDO_3DS) -f cia -exefslogo -o "isle.cia" - -rsf "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/template.rsf" + -rsf "${CMAKE_SOURCE_DIR}/packaging/3ds/template.rsf" -major "${CMAKE_PROJECT_VERSION_MAJOR}" -minor "${CMAKE_PROJECT_VERSION_MINOR}" -micro 0 -icon "isle.smdh" -banner "isle.bnr" -elf "isle.elf" - DEPENDS "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/template.rsf" "isle.smdh" "isle.bnr" + DEPENDS "${CMAKE_SOURCE_DIR}/packaging/3ds/template.rsf" "isle.smdh" "isle.bnr" COMMENT "Building CIA executable target isle.cia" VERBATIM ) diff --git a/ISLE/res/3ds/banner.wav b/ISLE/res/3ds/banner.wav deleted file mode 100644 index ce7849e7..00000000 Binary files a/ISLE/res/3ds/banner.wav and /dev/null differ diff --git a/ISLE/res/3ds/banner.png b/packaging/3ds/banner.png similarity index 100% rename from ISLE/res/3ds/banner.png rename to packaging/3ds/banner.png diff --git a/packaging/3ds/banner.wav b/packaging/3ds/banner.wav new file mode 100644 index 00000000..8eeb79ba Binary files /dev/null and b/packaging/3ds/banner.wav differ diff --git a/ISLE/res/3ds/icon.png b/packaging/3ds/icon.png similarity index 100% rename from ISLE/res/3ds/icon.png rename to packaging/3ds/icon.png diff --git a/ISLE/res/3ds/logo.bcma.lz b/packaging/3ds/logo.bcma.lz similarity index 100% rename from ISLE/res/3ds/logo.bcma.lz rename to packaging/3ds/logo.bcma.lz diff --git a/ISLE/res/3ds/template.rsf b/packaging/3ds/template.rsf similarity index 100% rename from ISLE/res/3ds/template.rsf rename to packaging/3ds/template.rsf