From 3c3c36c0b9ffb105f7a8cf18baa363dcddc81b0b Mon Sep 17 00:00:00 2001 From: Steven <139715581+StevenSYS@users.noreply.github.com> Date: Sat, 19 Jul 2025 20:05:09 +0000 Subject: [PATCH] Added Windows (MSVC) and Linux debug builds to CI (#631) Also fixed two warnings with the debug program --- .github/workflows/ci.yml | 6 ++++-- ISLE/isledebug.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d3b5e5f..0aefef65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,10 @@ jobs: matrix: include: - { name: 'Linux', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true } + - { name: 'Linux (Debug)', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true, debug: true } - { name: 'MSVC (x86)', os: 'windows-latest', generator: 'Ninja', dx5: true, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_x86' } - - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } + - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } + - { name: 'MSVC (x64 Debug)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', debug: true } - { name: 'MSVC (arm64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_arm64' } - { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' } - { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' } @@ -113,7 +115,7 @@ jobs: -DISLE_BUILD_CONFIG=${{ !!matrix.config }} \ -DENABLE_CLANG_TIDY=${{ !!matrix.clang-tidy }} \ -DISLE_WERROR=${{ !!matrix.werror }} \ - -DISLE_DEBUG=OFF \ + -DISLE_DEBUG=${{ matrix.debug || 'OFF' }} \ -Werror=dev - name: Build (CMake) diff --git a/ISLE/isledebug.cpp b/ISLE/isledebug.cpp index b62f4c09..5b9bd590 100644 --- a/ISLE/isledebug.cpp +++ b/ISLE/isledebug.cpp @@ -92,7 +92,7 @@ public: ImGui::TableNextColumn(); ImGui::Text("%d", entry->m_time); ImGui::TableNextColumn(); - ImGui::Text("%d", entry->m_y); + ImGui::Text("%f", entry->m_y); ImGui::TableNextColumn(); ImGui::Text("%d", entry->m_muted); } @@ -135,7 +135,7 @@ public: ImGui::Text("unk0x70: %u", videoManager->m_unk0x70); ImGui::Text("Dither: %d", videoManager->m_dither); ImGui::Text("BufferCount: %u", videoManager->m_bufferCount); - ImGui::Text("Paused: %f", videoManager->m_paused); + ImGui::Text("Paused: %d", videoManager->m_paused); ImGui::Text("back: %g", videoManager->m_back); ImGui::Text("front: %g", videoManager->m_front); ImGui::Text("cameraWidth: %g", videoManager->m_cameraWidth);