ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch: simplify standalone build

This commit is contained in:
scribam 2021-08-12 00:04:46 +02:00 committed by flyinghead
parent 3ea688be69
commit 281a04837f
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/switch.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
- name: CMake - name: CMake
run: | run: |
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/Switch.cmake ${{ matrix.config.cmakeArgs }} $DEVKITPRO/portlibs/switch/bin/aarch64-none-elf-cmake -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.config.cmakeArgs }}
cmake --build build --config Release --parallel 2 cmake --build build --config Release --parallel 2
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2

17
CMakeLists.txt
View File

@ -1283,16 +1283,13 @@ if(NINTENDO_SWITCH)
DEPENDS xxHash::xxhash chdr-static zip) DEPENDS xxHash::xxhash chdr-static zip)
add_dependencies(combined ${PROJECT_NAME}) add_dependencies(combined ${PROJECT_NAME})
else() else()
add_custom_command(OUTPUT flycast.nacp nx_generate_nacp(flycast.nacp NAME "Flycast" AUTHOR "flyinghead, M4xw" VERSION "${GIT_VERSION}")
COMMAND ${DEVKITPRO}/tools/bin/nacptool --create Flycast "flyinghead, M4xw" ${GIT_VERSION} ${CMAKE_BINARY_DIR}/flycast.nacp nx_create_nro(flycast NACP flycast.nacp ICON "${CMAKE_SOURCE_DIR}/shell/switch/flycast.jpeg")
COMMENT "Generating NACP info") add_custom_target(combined ALL
COMMAND mkdir -p artifact
add_custom_command(OUTPUT flycast.nro COMMAND mv flycast.nro artifact
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/artifact DEPENDS flycast_nro
COMMAND ${DEVKITPRO}/tools/bin/elf2nro ${CMAKE_BINARY_DIR}/flycast ${CMAKE_BINARY_DIR}/artifact/flycast.nro --icon=${CMAKE_SOURCE_DIR}/shell/switch/flycast.jpeg --nacp=${CMAKE_BINARY_DIR}/flycast.nacp WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
DEPENDS flycast.nacp ${CMAKE_BINARY_DIR}/flycast
COMMENT "Generating NRO")
add_custom_target(nro ALL DEPENDS flycast.nacp flycast.nro)
endif() endif()
endif() endif()