Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity

This commit is contained in:
Garrett Cox 2022-08-08 12:08:06 -05:00
commit cb97c2a205
2 changed files with 13 additions and 7 deletions

View File

@ -20,6 +20,9 @@ add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
include(cmake/automate-vcpkg.cmake)
set(VCPKG_TRIPLET x64-windows-static)
set(VCPKG_TARGET_TRIPLET x64-windows-static)
vcpkg_bootstrap()
vcpkg_install_packages(zlib bzip2 libpng)
endif()

View File

@ -1979,13 +1979,16 @@ endif()
if(CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch")
set_target_properties(soh PROPERTIES
APP_TITLE "Ship of Harkirian"
APP_AUTHOR "Ship"
APP_VERSION "3.0.0"
ICON "icon.jpg")
nx_create_nro(soh)
nx_generate_nacp(Ship.nacp
NAME "Ship of Harkinian"
AUTHOR "Harbour Masters"
VERSION "3.1.0"
)
nx_create_nro(soh
NACP Ship.nacp
ICON ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg
)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/soh.nro DESTINATION . COMPONENT ship)