mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-16 14:35:06 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1088 from HarbourMasters/develop-zhora

Browse Source 
quick zhora to rando next
This commit is contained in:
briaguya 2022-08-07 21:41:31 -04:00 committed by GitHub
commit f8f8e01039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

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

15
soh/CMakeLists.txt
View File

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