From bc8f7a5fc62b7268f1e9a20e9b18e1a0b3448413 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 5 Apr 2026 18:29:57 +0300
Subject: [PATCH] fix build

---
 .github/workflows/build-watcom.yml |  2 +-
 .github/workflows/build-win32.yml  | 64 ++++++++++++++++--------------
 .github/workflows/build-win64.yml  | 62 ++++++++++++++++-------------
 3 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/build-watcom.yml b/.github/workflows/build-watcom.yml
index 2904fda..6359ac7 100644
--- a/.github/workflows/build-watcom.yml
+++ b/.github/workflows/build-watcom.yml
@@ -62,7 +62,7 @@ jobs:
        copy doc\devel\*.rtf dist\3proxy\doc\devel\
        copy copying dist\3proxy\
        copy authors dist\3proxy\
-       copy READMEdist\3proxy\
+       copy README dist\3proxy\
        copy rus.3ps dist\3proxy\
     - name: Get artifact
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build-win32.yml b/.github/workflows/build-win32.yml
index 308f1f6..105418f 100644
--- a/.github/workflows/build-win32.yml
+++ b/.github/workflows/build-win32.yml
@@ -42,35 +42,41 @@ jobs:
        set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x86-windows/include"
        echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
        nmake /F Makefile.msvc
-       mkdir release
-       mkdir release\3proxy\
-       mkdir release\3proxy\bin
-       mkdir release\3proxy\cfg
-       mkdir release\3proxy\cfg\sql
-       mkdir release\3proxy\doc
-       mkdir release\3proxy\doc\ru
-       mkdir release\3proxy\doc\html
-       mkdir release\3proxy\doc\html\plugins
-       mkdir release\3proxy\doc\html\man3
-       mkdir release\3proxy\doc\html\man8
-       mkdir release\3proxy\doc\devel
-       copy /Y c:\vcpkg\installed\x64-windows\bin\pcre2-8.dll release\3proxy\bin
-       copy /Y c:\vcpkg\installed\x64-windows\bin\*crypto*.dll release\3proxy\bin
-       copy /Y c:\vcpkg\installed\x64-windows\bin\*ssl*.dll release\3proxy\bin
-       copy bin\3proxy.exe release\3proxy\bin\
-       copy bin\*.dll release\3proxy\bin\
-       copy bin\mycrypt.exe  release\3proxy\bin\
-       copy cfg\*.* release\3proxy\cfg\
-       copy cfg\sql\*.*  release\3proxy\cfg\sql\
-       copy doc\ru\*.*  release\3proxy\doc\ru\
-       copy doc\html\*.* release\3proxy\doc\html\
-       copy doc\html\plugins\*.* release\3proxy\doc\html\plugins\
-       copy doc\html\man8\*.* release\3proxy\doc\html\man8\
-       copy doc\html\man3\*.* release\3proxy\doc\html\man3\
-       copy doc\devel\*.rtf release\3proxy\doc\devel\
-       copy copying authors README rus.3ps release\3proxy\
+    - name: make dist dir
+      shell: cmd
+      run: |
+       mkdir dist
+       mkdir dist\3proxy
+       mkdir dist\3proxy\bin
+       mkdir dist\3proxy\cfg
+       mkdir dist\3proxy\cfg\sql
+       mkdir dist\3proxy\doc
+       mkdir dist\3proxy\doc\ru
+       mkdir dist\3proxy\doc\html
+       mkdir dist\3proxy\doc\html\plugins
+       mkdir dist\3proxy\doc\html\man3
+       mkdir dist\3proxy\doc\html\man8
+       mkdir dist\3proxy\doc\devel
+       copy bin\3proxy.exe dist\3proxy\bin\
+       copy bin\*.dll dist\3proxy\bin\
+       copy bin\mycrypt.exe  dist\3proxy\bin\
+       copy cfg\*.* dist\3proxy\cfg\
+       copy cfg\sql\*.*  dist\3proxy\cfg\sql\
+       copy doc\ru\*.*  dist\3proxy\doc\ru\
+       copy doc\html\*.* dist\3proxy\doc\html\
+       copy doc\html\plugins\*.* dist\3proxy\doc\html\plugins\
+       copy doc\html\man8\*.* dist\3proxy\doc\html\man8\
+       copy doc\html\man3\*.* dist\3proxy\doc\html\man3\
+       copy doc\devel\*.rtf dist\3proxy\doc\devel\
+       copy copying dist\3proxy\
+       copy authors dist\3proxy\
+       copy README dist\3proxy\
+       copy rus.3ps dist\3proxy\
+       copy /Y c:\vcpkg\installed\x86-windows\bin\pcre2-8.dll dist\3proxy\bin
+       copy /Y c:\vcpkg\installed\x86-windows\bin\*crypto*.dll dist\3proxy\bin
+       copy /Y c:\vcpkg\installed\x86-windows\bin\*ssl*.dll dist\3proxy\bin
     - name: Get artifact
       uses: actions/upload-artifact@v4
       with:
-       name: "3proxy-${{ env.RELEASE }}-x64.zip"
-       path: release/
+       name: "3proxy-${{ env.RELEASE }}.zip"
+       path: dist/
diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index f6b2e72..f884b0d 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -39,39 +39,45 @@ jobs:
        D:
        cd "D:/a/3proxy/3proxy"
        mkdir bin64
-       mkdir release
-       mkdir release\3proxy
-       mkdir release\3proxy\bin64
-       mkdir release\3proxy\cfg
-       mkdir release\3proxy\cfg\sql
-       mkdir release\3proxy\doc
-       mkdir release\3proxy\doc\ru
-       mkdir release\3proxy\doc\html
-       mkdir release\3proxy\doc\html\plugins
-       mkdir release\3proxy\doc\html\man3
-       mkdir release\3proxy\doc\html\man8
-       mkdir release\3proxy\doc\devel
-       copy /Y c:\vcpkg\installed\x64-windows\bin\pcre2-8.dll release\3proxy\bin64
-       copy /Y c:\vcpkg\installed\x64-windows\bin\*crypto*.dll release\3proxy\bin64
-       copy /Y c:\vcpkg\installed\x64-windows\bin\*ssl*.dll release\3proxy\bin64
-       copy bin64\3proxy.exe release\3proxy\bin64\
-       copy bin64\*.dll release\3proxy\bin64\
-       copy bin64\mycrypt.exe  release\3proxy\bin64\
-       copy cfg\*.* release\3proxy\cfg\
-       copy cfg\sql\*.*  release\3proxy\cfg\sql\
-       copy doc\ru\*.*  release\3proxy\doc\ru\
-       copy doc\html\*.* release\3proxy\doc\html\
-       copy doc\html\plugins\*.* release\3proxy\doc\html\plugins\
-       copy doc\html\man8\*.* release\3proxy\doc\html\man8\
-       copy doc\html\man3\*.* release\3proxy\doc\html\man3\
-       copy doc\devel\*.rtf release\3proxy\doc\devel\
-       copy copying authors README rus.3ps release\3proxy\
        set "LIB=%LIB%;c:/vcpkg/installed/x64-windows/lib"
        set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x64-windows/include"
        echo "volatile char VerSion[]=^"3APA3A-3proxy-Internal-Build: 3proxy-%RELEASE%%-%NOW%\r\nCode certificate: https://3proxy.org/3proxy.cer\r\n^";" >>src/3proxy.c
        nmake /F Makefile.msvc64
+    - name: make dist dir
+      shell: cmd
+      run: |
+       mkdir dist
+       mkdir dist\3proxy
+       mkdir dist\3proxy\bin
+       mkdir dist\3proxy\cfg
+       mkdir dist\3proxy\cfg\sql
+       mkdir dist\3proxy\doc
+       mkdir dist\3proxy\doc\ru
+       mkdir dist\3proxy\doc\html
+       mkdir dist\3proxy\doc\html\plugins
+       mkdir dist\3proxy\doc\html\man3
+       mkdir dist\3proxy\doc\html\man8
+       mkdir dist\3proxy\doc\devel
+       copy bin\3proxy.exe dist\3proxy\bin\
+       copy bin\*.dll dist\3proxy\bin\
+       copy bin\mycrypt.exe  dist\3proxy\bin\
+       copy cfg\*.* dist\3proxy\cfg\
+       copy cfg\sql\*.*  dist\3proxy\cfg\sql\
+       copy doc\ru\*.*  dist\3proxy\doc\ru\
+       copy doc\html\*.* dist\3proxy\doc\html\
+       copy doc\html\plugins\*.* dist\3proxy\doc\html\plugins\
+       copy doc\html\man8\*.* dist\3proxy\doc\html\man8\
+       copy doc\html\man3\*.* dist\3proxy\doc\html\man3\
+       copy doc\devel\*.rtf dist\3proxy\doc\devel\
+       copy copying dist\3proxy\
+       copy authors dist\3proxy\
+       copy README dist\3proxy\
+       copy rus.3ps dist\3proxy\
+       copy /Y c:\vcpkg\installed\x64-windows\bin\pcre2-8.dll dist\3proxy\bin64
+       copy /Y c:\vcpkg\installed\x64-windows\bin\*crypto*.dll dist\3proxy\bin64
+       copy /Y c:\vcpkg\installed\x64-windows\bin\*ssl*.dll dist\3proxy\bin64
     - name: Get artifact
       uses: actions/upload-artifact@v4
       with:
        name: "3proxy-${{ env.RELEASE }}-x64.zip"
-       path: release/
+       path: dist/