From cbb14cc09a80e01498aa5b84114461f785a30e0b Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Tue, 7 Apr 2026 15:13:17 +0300
Subject: [PATCH] Update windows builds

---
 .github/workflows/build-watcom.yml   | 1 -
 .github/workflows/build-win32.yml    | 9 +++------
 .github/workflows/build-win64.yml    | 9 +++------
 .github/workflows/build-winarm64.yml | 9 +++------
 Makefile.msvc                        | 6 ------
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-watcom.yml b/.github/workflows/build-watcom.yml
index 5862f3e..d63f9aa 100644
--- a/.github/workflows/build-watcom.yml
+++ b/.github/workflows/build-watcom.yml
@@ -25,7 +25,6 @@ jobs:
        echo "now: $NOW"
        $RELEASE = Get-Content -Path "RELEASE" -Raw
        echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
        echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
        echo "VERSION=/D VERSION=`"3proxy-$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
        echo "BUILDDATE=/D BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
diff --git a/.github/workflows/build-win32.yml b/.github/workflows/build-win32.yml
index 6db83ae..2ff58df 100644
--- a/.github/workflows/build-win32.yml
+++ b/.github/workflows/build-win32.yml
@@ -20,13 +20,10 @@ jobs:
     - name: set date
       run: |
        $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
        $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding
+       echo "VERSION=/D VERSION=`"3proxy-$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: install packages
       run: vcpkg install pcre2:x86-windows-static openssl:x86-windows-static
     - name: Add msbuild to PATH
diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index f49d1af..5773e01 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -20,13 +20,10 @@ jobs:
     - name: set date
       run: |
        $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
        $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding
+       echo "VERSION=/D VERSION=`"3proxy-$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: install packages
       run: vcpkg install pcre2:x64-windows-static openssl:x64-windows-static
     - name: Add msbuild to PATH
diff --git a/.github/workflows/build-winarm64.yml b/.github/workflows/build-winarm64.yml
index 2a27f28..a9d1d68 100644
--- a/.github/workflows/build-winarm64.yml
+++ b/.github/workflows/build-winarm64.yml
@@ -20,13 +20,10 @@ jobs:
     - name: set date
       run: |
        $NOW = Get-Date -Format "yyMMddHHmmss"
-       echo "now: $NOW"
        $RELEASE = Get-Content -Path "RELEASE" -Raw
-       echo "release: $RELEASE"
-       echo "NOW=$NOW" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "VERSION=VERSION=`"$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-       echo "BUILDDATE=BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "RELEASE=$RELEASE" | Out-File -FilePath $env:GITHUB_ENV -Encoding
+       echo "VERSION=/D VERSION=`"3proxy-$RELEASE`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+       echo "BUILDDATE=/D BUILDDATE=`"$NOW`"" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: install packages
       run: vcpkg install pcre2:arm64-windows-static openssl:arm64-windows-static
     - name: Add msbuild to PATH
diff --git a/Makefile.msvc b/Makefile.msvc
index 6b39fb5..1651174 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -7,12 +7,6 @@
 BUILDDIR = ../bin/
 CC = cl
 CFLAGS = /nologo /MT /W3 /Ox /GS /EHs- /GA /GF /D "MSVC"  /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "WITH_SSL" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /Fp"proxy.pch" /FD /c
-!IFDEF RELEASE
-VERSION=/D VERSION=\"3proxy-$(RELEASE)\"
-!ENDIF
-!IFDEF NOW
-BUILDDATE=/D BUILDDATE=\"$(NOW)\"
-!ENDIF
 COUT = /Fo
 LN = link
 LDFLAGS =  /nologo /subsystem:console /incremental:no