isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-02 20:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

split makerom and bannertool commands, fix make install when no CIA is built

Browse Source
This commit is contained in:
Korbo 2025-07-07 17:58:59 -05:00
parent 1ad655e5b5
commit 310d3c338a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -760,23 +760,36 @@ if(NINTENDO_3DS)
if(BANNERTOOL AND MAKEROM) if(BANNERTOOL AND MAKEROM)
add_custom_command( add_custom_command(
OUTPUT "isle.bnr" OUTPUT "isle.bnr"
COMMAND "${BANNERTOOL}" makebanner -i "../ISLE/res/3ds/banner.png" -a "../ISLE/res/3ds/banner.wav" -o "isle.bnr" COMMAND "${BANNERTOOL}" makebanner
DEPENDS "../ISLE/res/3ds/banner.png" "../ISLE/res/3ds/banner.wav" -i "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png"
-a "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav"
-o "isle.bnr"
DEPENDS "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.png" "${CMAKE_SOURCE_DIR}/ISLE/res/3ds/banner.wav"
VERBATIM VERBATIM
) )
add_custom_command( add_custom_command(
OUTPUT "isle.cia" OUTPUT "isle.cia"
COMMAND "${MAKEROM}" -f cia -exefslogo -o "isle.cia" -rsf "../ISLE/res/3ds/template.rsf" -major "${CMAKE_PROJECT_VERSION_MAJOR}" -minor "${CMAKE_PROJECT_VERSION_MINOR}" -micro 0 -icon "isle.smdh" -banner "isle.bnr" -elf "isle.elf" COMMAND "${MAKEROM}"
DEPENDS "ISLE/res/3ds/template.rsf" "isle.smdh" "isle.bnr" -f cia
-exefslogo
-o "isle.cia"
-rsf "${CMAKE_SOURCE_DIR}/ISLE/res/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"
COMMENT "Building CIA executable target isle.cia" COMMENT "Building CIA executable target isle.cia"
VERBATIM VERBATIM
) )
add_custom_target("isle_cia" ALL DEPENDS "isle.cia" isle) add_custom_target("isle_cia" ALL DEPENDS "isle.cia" isle)
install(FILES "$<TARGET_FILE_DIR:isle>/isle.cia" DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif() endif()
install(FILES "$<TARGET_FILE_DIR:isle>/isle.3dsx" DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES "$<TARGET_FILE_DIR:isle>/isle.3dsx" DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(FILES "$<TARGET_FILE_DIR:isle>/isle.cia" DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif() endif()
if(WINDOWS_STORE) if(WINDOWS_STORE)
install( install(