From 1a753da70d9fc478f9517a3d8f46019fdae596da Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Sat, 4 Apr 2026 12:59:38 +0300 Subject: [PATCH] Update workflows and makefiles (5 commits squashed) --- .github/workflows/c-cpp.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a2d2331..69471f2 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -77,6 +77,17 @@ jobs: set "INCLUDE=%INCLUDE%;c:/program files/openssl/include;c:/vcpkg/installed/x64-windows/include" nmake /F Makefile.msvc64 nmake /F Makefile.msvc64 clean - - name: make Windows MSVC - run: mkdir build && cd build && cmake .. && make - + - name: make with CMake POSIX + if: ${{ ! startsWith(matrix.target, 'windows') }} + run: mkdir build && cd build && cmake .. && cmake --build . + - name: make with CMake Win + if: ${{ startsWith(matrix.target, 'windows') }} + shell: cmd + run: | + mkdir build + cd build + set "LIB=%LIB%;c:/program files/openssl/lib/VC/x64/MT;c:/vcpkg/installed/x64-windows/lib" + set "INCLUDE=%INCLUDE%;c:/program files/openssl/include;c:/vcpkg/installed/x64-windows/include" + cmake .. + dir + cmake --build .