From 81f573ddec9f6f9dc3205d0db29075a604d1056b Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Mon, 30 Mar 2026 19:50:18 +0300
Subject: [PATCH] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 45 ++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e8621f5..0e50d47 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -26,36 +26,45 @@ jobs:
     - name: Linux libraries
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: sudo apt install libssl-dev libpam-dev libpcre3 libpcre3-dev
-    - name: Mac libraries
-      if: ${{ startsWith(matrix.target, 'macos') }}
-      run: brew install pcre
-    - name: make Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: make -f Makefile.win
-      env:
-       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
-       CFLAGS: '-I "c:/program files/openssl/include"'
     - name: make Ubuntu
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: make -f Makefile.Linux
-    - name: make MacOS
-      if: ${{ startsWith(matrix.target, 'macos') }}
-      run: make -f Makefile.FreeBSD
-      env:
-       LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib"
-       CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include"
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: mkdir ~/3proxy
     - name: make install
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: make -f Makefile.Linux DESTDIR=~/3proxy install
-    - name: make clean Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: make -f Makefile.win clean
     - name: make clean Linux
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: make -f Makefile.Linux clean
+    - name: Mac libraries
+      if: ${{ startsWith(matrix.target, 'macos') }}
+      run: brew install pcre
+    - name: make MacOS
+      if: ${{ startsWith(matrix.target, 'macos') }}
+      run: make -f Makefile.FreeBSD
+      env:
+       LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib"
+       CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include"
     - name: make clean MacOS
       if: ${{ startsWith(matrix.target, 'macos') }}
       run: make -f Makefile.FreeBSD clean
+    - name: make Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: make -f Makefile.win
+      env:
+       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
+       CFLAGS: '-I "c:/program files/openssl/include"'
+    - name: make clean Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: make -f Makefile.win clean
+    - name: make Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: nmake /F Makefile.msvc64
+      env:
+       LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
+       CFLAGS: '-I "c:/program files/openssl/include"'
+    - name: make clean Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: nmake /F Makefile.msvc64 clean