From 764dfdb1b6ae9a742cfd73eaa2ac421edd3eed8b Mon Sep 17 00:00:00 2001
From: staphen <staphen@gmail.com>
Date: Sat, 7 Aug 2021 18:40:57 -0400
Subject: [PATCH] Fix 3DS build failures when running builds anywhere besides
 the build directory

---
 CMake/ctr/Tools3DS.cmake   | 8 ++++----
 CMakeLists.txt             | 2 +-
 Packaging/ctr/template.rsf | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMake/ctr/Tools3DS.cmake b/CMake/ctr/Tools3DS.cmake
index 7ff66e52e..8146e816e 100644
--- a/CMake/ctr/Tools3DS.cmake
+++ b/CMake/ctr/Tools3DS.cmake
@@ -362,13 +362,13 @@ function(add_cia_target target RSF IMAGE SOUND)
                         COMMAND ${MAKEROM}     -f cia
                                             -target t
                                             -exefslogo
-                                            -o ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.cia
+                                            -o ${target_we}.cia
                                             -elf $<TARGET_FILE:${target}>-stripped
                                             -rsf ${RSF}
-                                            -banner ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.bnr
-                                            -icon ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.smdh
+                                            -banner ${target_we}.bnr
+                                            -icon ${target_we}.smdh
                         DEPENDS ${target} ${RSF} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.bnr ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.smdh
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                         VERBATIM
     )
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 033dd118c..fa032cb9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -936,7 +936,7 @@ if(NINTENDO_3DS)
 
   include(Tools3DS)
   add_3dsx_target(${BIN_TARGET})
-  add_cia_target(${BIN_TARGET} ${APP_RSF} ${APP_BANNER} ${APP_AUDIO} ${APP_ROMFS})
+  add_cia_target(${BIN_TARGET} ${APP_RSF} ${APP_BANNER} ${APP_AUDIO})
 endif()
 
 if(CPACK)
diff --git a/Packaging/ctr/template.rsf b/Packaging/ctr/template.rsf
index e8d70cba7..a129aedf5 100644
--- a/Packaging/ctr/template.rsf
+++ b/Packaging/ctr/template.rsf
@@ -5,7 +5,7 @@ BasicInfo:
 
 RomFs:
   # Specifies the root path of the read only file system to include in the ROM.
-  RootPath                : build/romfs
+  RootPath                : romfs
 
 TitleInfo:
   Category                : Application