From cefc9c02fa2bae8a4cd71019c397420d5064b2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Tue, 17 Mar 2026 04:54:04 +0000 Subject: [PATCH] update gh actions, fix cmake whitespace (#6361) --- .github/workflows/clang-format.yml | 2 +- .github/workflows/generate-builds.yml | 36 +- .github/workflows/pr-artifacts.yml | 4 +- .github/workflows/test-builds-on-distros.yml | 2 +- soh/CMakeLists.txt | 365 +++++++++---------- 5 files changed, 204 insertions(+), 205 deletions(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 604a3dd70..376cfc3a5 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -8,7 +8,7 @@ jobs: clang-format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 2 - name: Install clang-format diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml index c1c00ad08..19f25345b 100644 --- a/.github/workflows/generate-builds.yml +++ b/.github/workflows/generate-builds.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Git Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true - name: Configure ccache @@ -27,7 +27,7 @@ jobs: sudo apt-get update sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) libzip-dev zipcmp zipmerge ziptool - name: Restore Cached deps folder - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} restore-keys: | @@ -68,7 +68,7 @@ jobs: cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release cmake --build build-cmake --config Release --target GenerateSohOtr -j3 - name: Upload soh.o2r - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: soh.o2r path: soh.o2r @@ -79,7 +79,7 @@ jobs: runs-on: macos-14 steps: - name: Git Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true - name: Configure ccache @@ -99,7 +99,7 @@ jobs: sudo chmod +x /opt/homebrew/bin/gtar - name: Restore Cached MacPorts id: restore-cache-macports - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }} restore-keys: | @@ -123,7 +123,7 @@ jobs: sudo port install $(cat .github/workflows/macports-deps.txt) brew install ninja - name: Download soh.o2r - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: name: soh.o2r path: build-cmake/soh @@ -137,7 +137,7 @@ jobs: mv _packages/*.dmg SoH.dmg mv README.md readme.txt - name: Upload build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: soh-mac path: | @@ -145,7 +145,7 @@ jobs: readme.txt - name: Save Cache MacPorts if: ${{ github.ref_name == github.event.repository.default_branch }} - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: key: ${{ steps.restore-cache-macports.outputs.cache-primary-key }} path: /opt/local/ @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Git Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true - name: Install dependencies @@ -172,7 +172,7 @@ jobs: ${{ runner.os }}-ccache - name: Restore Cached deps folder id: restore-cache-deps - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} restore-keys: | @@ -234,7 +234,7 @@ jobs: sudo make install sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/ - name: Download soh.o2r - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: name: soh.o2r path: build-cmake/soh @@ -251,7 +251,7 @@ jobs: CC: gcc-12 CXX: g++-12 - name: Upload build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: soh-linux path: | @@ -259,7 +259,7 @@ jobs: readme.txt - name: Save Cache deps folder if: ${{ github.ref_name == github.event.repository.default_branch }} - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: key: ${{ steps.restore-cache-deps.outputs.cache-primary-key }} path: deps @@ -273,7 +273,7 @@ jobs: choco install ninja -y Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue - name: Git Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true - name: Configure sccache @@ -289,7 +289,7 @@ jobs: ${{ runner.os }}-ccache - name: Restore Cached VCPKG folder id: restore-cache-vcpkg - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }} restore-keys: | @@ -299,7 +299,7 @@ jobs: - name: Configure Developer Command Prompt uses: ilammy/msvc-dev-cmd@v1 - name: Download soh.o2r - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: name: soh.o2r path: build-windows/soh @@ -317,13 +317,13 @@ jobs: - name: Unzip package run: Expand-Archive -Path _packages/soh-windows.zip -DestinationPath soh-windows - name: Upload build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: soh-windows path: soh-windows - name: Save Cache VCPKG folder if: ${{ github.ref_name == github.event.repository.default_branch }} - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: key: ${{ steps.restore-cache-vcpkg.outputs.cache-primary-key }} path: vcpkg diff --git a/.github/workflows/pr-artifacts.yml b/.github/workflows/pr-artifacts.yml index 5b20030af..e56a5cf38 100644 --- a/.github/workflows/pr-artifacts.yml +++ b/.github/workflows/pr-artifacts.yml @@ -12,7 +12,7 @@ jobs: if: ${{ github.event.workflow_run.event == 'pull_request' }} steps: - id: 'pr-number' - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: result-encoding: string script: | @@ -37,7 +37,7 @@ jobs: return prNumber; - id: 'artifacts-text' - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: result-encoding: string script: | diff --git a/.github/workflows/test-builds-on-distros.yml b/.github/workflows/test-builds-on-distros.yml index 8b6ded6d6..4da692e2c 100644 --- a/.github/workflows/test-builds-on-distros.yml +++ b/.github/workflows/test-builds-on-distros.yml @@ -59,7 +59,7 @@ jobs: cmake .. make sudo make install - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: true - name: Build SoH diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index b0630e841..31955ebf9 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -19,15 +19,15 @@ set (BUILD_SHARED_LIBS OFF CACHE STRING "install/link shared instead of static l # Set target arch type if empty. Visual studio solution generator provides it. ################################################################################ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if(NOT CMAKE_VS_PLATFORM_NAME) - set(CMAKE_VS_PLATFORM_NAME "x64") - endif() - message("${CMAKE_VS_PLATFORM_NAME} architecture in use") + if(NOT CMAKE_VS_PLATFORM_NAME) + set(CMAKE_VS_PLATFORM_NAME "x64") + endif() + message("${CMAKE_VS_PLATFORM_NAME} architecture in use") - if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64" - OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")) - message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!") - endif() + if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64" + OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")) + message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!") + endif() endif() ################################################################################ @@ -232,55 +232,55 @@ endif() set(ROOT_NAMESPACE soh) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - set_target_properties(${PROJECT_NAME} PROPERTIES - VS_GLOBAL_KEYWORD "Win32Proj" - ) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() + set_target_properties(${PROJECT_NAME} PROPERTIES + VS_GLOBAL_KEYWORD "Win32Proj" + ) + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") + set_target_properties(${PROJECT_NAME} PROPERTIES + INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" + ) + elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") + set_target_properties(${PROJECT_NAME} PROPERTIES + INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" + ) + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES OUTPUT_NAME "soh-macos" ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set_target_properties(${PROJECT_NAME} PROPERTIES - OUTPUT_NAME "soh.elf" - ) + set_target_properties(${PROJECT_NAME} PROPERTIES + OUTPUT_NAME "soh.elf" + ) endif() ################################################################################ # MSVC runtime library ################################################################################ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() - set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) + get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") + string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" + $<$: + MultiThreadedDebug + > + $<$: + MultiThreaded + > + $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> + ) + elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") + string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" + $<$: + MultiThreadedDebug + > + $<$: + MultiThreaded + > + $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> + ) + endif() + set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) endif() ################################################################################ # Find/download Dr Libs (For custom audio) @@ -317,94 +317,94 @@ endif() ################################################################################ target_include_directories(${PROJECT_NAME} PRIVATE assets - ${CMAKE_CURRENT_SOURCE_DIR}/include/ - ${CMAKE_CURRENT_SOURCE_DIR}/src/ + ${CMAKE_CURRENT_SOURCE_DIR}/include/ + ${CMAKE_CURRENT_SOURCE_DIR}/src/ ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/include ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type - ${SDL2-INCLUDE} + ${SDL2-INCLUDE} ${SDL2-NET-INCLUDE} - ${CMAKE_CURRENT_SOURCE_DIR}/assets/ - ${dr_libs_SOURCE_DIR} - . + ${CMAKE_CURRENT_SOURCE_DIR}/assets/ + ${dr_libs_SOURCE_DIR} + . ) if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS;" - "ENABLE_DX11;" - ">" - "$<$:" - "NDEBUG;" - ">" + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") + target_compile_definitions(${PROJECT_NAME} PRIVATE + "$<$:" + "_DEBUG;" + "_CRT_SECURE_NO_WARNINGS;" + "ENABLE_DX11;" + ">" + "$<$:" + "NDEBUG;" + ">" "$<$:ENABLE_REMOTE_CONTROL>" - "INCLUDE_GAME_PRINTF;" + "INCLUDE_GAME_PRINTF;" "F3DEX_GBI_2" - "UNICODE;" - "_UNICODE" + "UNICODE;" + "_UNICODE" SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF} LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF} - STORMLIB_NO_AUTO_LINK - "_CRT_SECURE_NO_WARNINGS;" + STORMLIB_NO_AUTO_LINK + "_CRT_SECURE_NO_WARNINGS;" NOMINMAX - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "NOINCLUDE_GAME_PRINTF;" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS;" - "ENABLE_OPENGL;" - ">" - "$<$:" - "NDEBUG;" - ">" - "INCLUDE_GAME_PRINTF;" + ) + elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") + target_compile_definitions(${PROJECT_NAME} PRIVATE + "$<$:" + "NOINCLUDE_GAME_PRINTF;" + "_DEBUG;" + "_CRT_SECURE_NO_WARNINGS;" + "ENABLE_OPENGL;" + ">" + "$<$:" + "NDEBUG;" + ">" + "INCLUDE_GAME_PRINTF;" "F3DEX_GBI_2" - "WIN32;" - "UNICODE;" - "_UNICODE;" + "WIN32;" + "UNICODE;" + "_UNICODE;" SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF} LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF} - STORMLIB_NO_AUTO_LINK + STORMLIB_NO_AUTO_LINK NOMINMAX - ) - endif() + ) + endif() elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - ">" - "$<$:" - "NDEBUG;" - ">" + target_compile_definitions(${PROJECT_NAME} PRIVATE + "$<$:" + "_DEBUG;" + ">" + "$<$:" + "NDEBUG;" + ">" "F3DEX_GBI_2;" - "SPDLOG_NO_THREAD_ID;" + "SPDLOG_NO_THREAD_ID;" "SPDLOG_NO_TLS;" - "STBI_NO_THREAD_LOCALS;" + "STBI_NO_THREAD_LOCALS;" SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF} LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF} - ) + ) elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - ">" - "$<$:" - "NDEBUG;" - ">" + target_compile_definitions(${PROJECT_NAME} PRIVATE + "$<$:" + "_DEBUG;" + ">" + "$<$:" + "NDEBUG;" + ">" "F3DEX_GBI_2;" "$<$:ENABLE_REMOTE_CONTROL>;" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "ENABLE_OPENGL;" - "UNICODE;" - "_UNICODE;" + "_CONSOLE;" + "_CRT_SECURE_NO_WARNINGS;" + "ENABLE_OPENGL;" + "UNICODE;" + "_UNICODE;" SPDLOG_ACTIVE_LEVEL=${SPDLOG_MIN_CUTOFF} LOG_LEVEL_GAME_PRINTS=${SPDLOG_LEVEL_OFF} - ) + ) endif() ################################################################################ # Compile and link options @@ -558,7 +558,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang") ) else() if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") - set(CPU_OPTION -msse2 -mfpmath=sse) + set(CPU_OPTION -msse2 -mfpmath=sse) endif() target_compile_options(${PROJECT_NAME} PRIVATE @@ -580,12 +580,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang") $<$:-fpermissive> $<$:-Wno-deprecated-enum-enum-conversion> -pthread - ${CPU_OPTION} + ${CPU_OPTION} ) target_link_options(${PROJECT_NAME} PRIVATE -pthread - #-fsanitize=address + #-fsanitize=address -Wl,-export-dynamic ) endif() @@ -594,22 +594,22 @@ endif() # Pre build events ################################################################################ if (CMAKE_GENERATOR MATCHES "Visual Studio") - add_custom_command( + add_custom_command( TARGET ${PROJECT_NAME} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor ${CMAKE_BINARY_DIR}/soh/assets + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor ${CMAKE_BINARY_DIR}/soh/assets COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml ${CMAKE_BINARY_DIR}/soh/assets/xml ) endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") add_custom_command( - TARGET ${PROJECT_NAME} - POST_BUILD - COMMENT "Copying asset xmls..." + TARGET ${PROJECT_NAME} + POST_BUILD + COMMENT "Copying asset xmls..." COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor $/assets - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $/assets/xml + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $/assets/xml COMMAND ${CMAKE_COMMAND} -E make_directory $/assets/symbols - # COMMAND ${VS_COPY_ASSETS_CMD} + # COMMAND ${VS_COPY_ASSETS_CMD} ) endif() ################################################################################ @@ -626,49 +626,49 @@ endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(glfw3 REQUIRED) - find_package(Ogg CONFIG REQUIRED) - link_libraries(Ogg::ogg) + find_package(Ogg CONFIG REQUIRED) + link_libraries(Ogg::ogg) - find_package(Vorbis CONFIG REQUIRED) - link_libraries(Vorbis::vorbisfile) - find_package(Opus CONFIG REQUIRED) - link_libraries(Opus::opus) - find_package(OpusFile CONFIG REQUIRED) - link_libraries(OpusFile::opusfile CONFIG REQUIRED) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "libultraship;" - "ZAPDLib;" - "glu32;" - "SDL2::SDL2;" - "SDL2::SDL2main;" + find_package(Vorbis CONFIG REQUIRED) + link_libraries(Vorbis::vorbisfile) + find_package(Opus CONFIG REQUIRED) + link_libraries(Opus::opus) + find_package(OpusFile CONFIG REQUIRED) + link_libraries(OpusFile::opusfile CONFIG REQUIRED) + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") + set(ADDITIONAL_LIBRARY_DEPENDENCIES + "libultraship;" + "ZAPDLib;" + "glu32;" + "SDL2::SDL2;" + "SDL2::SDL2main;" "$<$:SDL2_net::SDL2_net-static>" - "glfw;" - "winmm;" - "imm32;" - "version;" - "setupapi" - "Ogg::ogg" - "Opus::opus" - "Vorbis::vorbis" - "Vorbis::vorbisenc" - "Vorbis::vorbisfile" - "OpusFile::opusfile" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "libultraship;" - "ZAPDLib;" - "glu32;" - "SDL2::SDL2;" - "SDL2::SDL2main;" - "glfw;" - "winmm;" - "imm32;" - "version;" - "setupapi" - ) - endif() + "glfw;" + "winmm;" + "imm32;" + "version;" + "setupapi" + "Ogg::ogg" + "Opus::opus" + "Vorbis::vorbis" + "Vorbis::vorbisenc" + "Vorbis::vorbisfile" + "OpusFile::opusfile" + ) + elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") + set(ADDITIONAL_LIBRARY_DEPENDENCIES + "libultraship;" + "ZAPDLib;" + "glu32;" + "SDL2::SDL2;" + "SDL2::SDL2main;" + "glfw;" + "winmm;" + "imm32;" + "version;" + "setupapi" + ) + endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") find_package(SDL2) set(THREADS_PREFER_PTHREAD_FLAG ON) @@ -694,25 +694,24 @@ else() find_package(SDL2) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) - find_package(Threads REQUIRED) - find_package(Ogg REQUIRED) - find_package(Vorbis REQUIRED) - find_package(Opus REQUIRED) - find_package(OpusFile REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "libultraship;" - "ZAPDLib;" - SDL2::SDL2 - "Ogg::ogg" - "Vorbis::vorbis" - "Vorbis::vorbisenc" - "Vorbis::vorbisfile" - "Opus::opus" - "Opusfile::Opusfile" + find_package(Ogg REQUIRED) + find_package(Vorbis REQUIRED) + find_package(Opus REQUIRED) + find_package(OpusFile REQUIRED) + set(ADDITIONAL_LIBRARY_DEPENDENCIES + "libultraship;" + "ZAPDLib;" + SDL2::SDL2 + "Ogg::ogg" + "Vorbis::vorbis" + "Vorbis::vorbisenc" + "Vorbis::vorbisfile" + "Opus::opus" + "Opusfile::Opusfile" "$<$:SDL2_net::SDL2_net>" - ${CMAKE_DL_LIBS} - Threads::Threads - ) + ${CMAKE_DL_LIBS} + Threads::Threads + ) endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|NintendoSwitch|CafeOS") @@ -765,10 +764,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "CafeOS") wut_create_rpx(${PROJECT_NAME}) wut_create_wuhb(${PROJECT_NAME} - NAME "Ship of Harkinian" - SHORTNAME "SoH" - AUTHOR "${PROJECT_TEAM}" - ICON ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg + NAME "Ship of Harkinian" + SHORTNAME "SoH" + AUTHOR "${PROJECT_TEAM}" + ICON ${CMAKE_CURRENT_SOURCE_DIR}/icon.jpg ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/soh.rpx ${CMAKE_CURRENT_BINARY_DIR}/soh.wuhb DESTINATION . COMPONENT ship)