From 0450eff9501851edaeddca8e8c562da318d978d1 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 5 Apr 2026 17:19:34 +0300
Subject: [PATCH] update build

---
 .github/workflows/build-watcom.yml | 30 +++++++++++++++---------------
 .github/workflows/build-win32.yml  | 30 +++++++++++++++---------------
 .github/workflows/build-win64.yml  | 30 +++++++++++++++---------------
 Makefile.watcom                    |  8 +-------
 4 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build-watcom.yml b/.github/workflows/build-watcom.yml
index cb057fe..b3697d9 100644
--- a/.github/workflows/build-watcom.yml
+++ b/.github/workflows/build-watcom.yml
@@ -39,18 +39,18 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-light.zip"
        path: |
-        bin/3proxy.exe
-        bin/*.dll
-        bin/mycrypt.exe
-        cfg/*.*
-        cfg/sql/*.*
-        doc/ru/*.*
-        doc/html/*.*
-        doc/html/plugins/*.*
-        doc/html/man8/*.*
-        doc/html/man3/*.*
-        doc/devel/*.rtf
-        copying
-        authors
-        README
-        rus.3ps
+        ../3proxy/bin64/3proxy.exe
+        ../3proxy/bin64/*.dll
+        ../3proxy/bin64/mycrypt.exe
+        ../3proxy/cfg/*.*
+        ../3proxy/cfg/sql/*.*
+        ../3proxy/doc/ru/*.*
+        ../3proxy/doc/html/*.*
+        ../3proxy/doc/html/plugins/*.*
+        ../3proxy/doc/html/man8/*.*
+        ../3proxy/doc/html/man3/*.*
+        ../3proxy/doc/devel/*.rtf
+        ../3proxy/copying
+        ../3proxy/authors
+        ../3proxy/README
+        ../3proxy/rus.3ps
diff --git a/.github/workflows/build-win32.yml b/.github/workflows/build-win32.yml
index bdaae0d..6e7580e 100644
--- a/.github/workflows/build-win32.yml
+++ b/.github/workflows/build-win32.yml
@@ -50,18 +50,18 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}.zip"
        path: |
-        bin/3proxy.exe
-        bin/*.dll
-        bin/mycrypt.exe
-        cfg/*.*
-        cfg/sql/*.*
-        doc/ru/*.*
-        doc/html/*.*
-        doc/html/plugins/*.*
-        doc/html/man8/*.*
-        doc/html/man3/*.*
-        doc/devel/*.rtf
-        copying
-        authors
-        README
-        rus.3ps
+        ../3proxy/bin64/3proxy.exe
+        ../3proxy/bin64/*.dll
+        ../3proxy/bin64/mycrypt.exe
+        ../3proxy/cfg/*.*
+        ../3proxy/cfg/sql/*.*
+        ../3proxy/doc/ru/*.*
+        ../3proxy/doc/html/*.*
+        ../3proxy/doc/html/plugins/*.*
+        ../3proxy/doc/html/man8/*.*
+        ../3proxy/doc/html/man3/*.*
+        ../3proxy/doc/devel/*.rtf
+        ../3proxy/copying
+        ../3proxy/authors
+        ../3proxy/README
+        ../3proxy/rus.3ps
diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index c5a1971..07f1360 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -52,18 +52,18 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-x64.zip"
        path: |
-        bin64/3proxy.exe
-        bin64/*.dll
-        bin64/mycrypt.exe
-        cfg/*.*
-        cfg/sql/*.*
-        doc/ru/*.*
-        doc/html/*.*
-        doc/html/plugins/*.*
-        doc/html/man8/*.*
-        doc/html/man3/*.*
-        doc/devel/*.rtf
-        copying
-        authors
-        README
-        rus.3ps
+        ../3proxy/bin64/3proxy.exe
+        ../3proxy/bin64/*.dll
+        ../3proxy/bin64/mycrypt.exe
+        ../3proxy/cfg/*.*
+        ../3proxy/cfg/sql/*.*
+        ../3proxy/doc/ru/*.*
+        ../3proxy/doc/html/*.*
+        ../3proxy/doc/html/plugins/*.*
+        ../3proxy/doc/html/man8/*.*
+        ../3proxy/doc/html/man3/*.*
+        ../3proxy/doc/devel/*.rtf
+        ../3proxy/copying
+        ../3proxy/authors
+        ../3proxy/README
+        ../3proxy/rus.3ps
diff --git a/Makefile.watcom b/Makefile.watcom
index df55b07..d2dc5ab 100644
--- a/Makefile.watcom
+++ b/Makefile.watcom
@@ -33,7 +33,7 @@ TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.watcom
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin
-VERFILE = $(VERFILE)
+VERFILE = 3proxy.res $(VERFILE)
 VERSION = $(VERSION)
 VERSIONDEP = 3proxy.res $(VERSIONDEP)
 BUILDDATE = $(BUILDDATE)
@@ -68,9 +68,3 @@ allplugins:
 	nmake
 	del *.obj *.idb
 	cd ../../
-	copy Makefile plugins\PCREPlugin
-	copy Makefile.var plugins\PCREPlugin
-	cd plugins\PCREPlugin
-	nmake
-	del *.obj *.idb
-	cd ../../