CI/CD: fix for Windows

This commit is contained in:
2026-03-31 11:09:05 +02:00
parent 81b63f5e67
commit 63921c3ac5
5 changed files with 45 additions and 21 deletions

View File

@@ -46,7 +46,7 @@ jobs:
- name: Install vcpkg dependencies
run: |
vcpkg install sdl2 fftw3 libsndfile --triplet x64-windows
vcpkg install sdl2 fftw3 "libsndfile[core]" --triplet x64-windows
- name: Configure
run: >

View File

@@ -180,12 +180,31 @@ if(EMSCRIPTEN)
else()
# ── Native Build ─────────────────────────────────────────────────────────
if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "/Zi /Od")
else()
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -fsanitize=address,undefined")
endif()
find_package(PkgConfig REQUIRED)
find_package(OpenGL REQUIRED)
if(MSVC)
find_package(SDL2 CONFIG REQUIRED)
find_package(FFTW3f CONFIG REQUIRED)
find_package(SndFile CONFIG REQUIRED)
target_link_libraries(imgui PUBLIC SDL2::SDL2 OpenGL::GL)
add_executable(baudmine ${SOURCES})
target_include_directories(baudmine PRIVATE src)
target_link_libraries(baudmine PRIVATE
imgui SDL2::SDL2 SDL2::SDL2main
FFTW3::fftw3f SndFile::sndfile OpenGL::GL
)
else()
find_package(PkgConfig REQUIRED)
pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
pkg_check_modules(FFTW3F REQUIRED IMPORTED_TARGET fftw3f)
pkg_check_modules(SNDFILE REQUIRED IMPORTED_TARGET sndfile)
@@ -195,17 +214,13 @@ else()
add_executable(baudmine ${SOURCES})
target_include_directories(baudmine PRIVATE src)
target_link_libraries(baudmine PRIVATE
imgui
PkgConfig::SDL2
PkgConfig::FFTW3F
PkgConfig::SNDFILE
OpenGL::GL
pthread
imgui PkgConfig::SDL2 PkgConfig::FFTW3F
PkgConfig::SNDFILE OpenGL::GL pthread
)
# Link math library and dl on Unix (dl needed by miniaudio for backend loading)
if(UNIX)
target_link_libraries(baudmine PRIVATE m dl)
endif()
endif()
endif()

View File

@@ -30,6 +30,9 @@ EM_JS(void, js_clearCanvasInlineSize, (), {
if (c) { c.style.width = ''; c.style.height = ''; }
});
#elif defined(_WIN32)
#include <windows.h>
#include <GL/gl.h>
#else
#include <GL/gl.h>
#endif

View File

@@ -4,6 +4,9 @@
#ifdef __EMSCRIPTEN__
#include <GLES2/gl2.h>
#elif defined(_WIN32)
#include <windows.h>
#include <GL/gl.h>
#else
#include <GL/gl.h>
#endif

View File

@@ -2,6 +2,9 @@
#include "core/Types.h"
#include "ui/ColorMap.h"
#ifdef _WIN32
#include <windows.h>
#endif
#include <GL/gl.h>
#include <vector>
#include <deque>