Change Makefile

.github/workflows/build-win64.yml

@@ -33,14 +33,6 @@ jobs:
       run: echo builddate:%BUILDDATE% release:%RELEASE% version:%VERSION% now:%NOW%
     - name: install packages
       run: vcpkg install pcre2:x64-windows
-#    - name: make Windows
-#      run: make -f Makefile.win
-#      env:
-#       LDFLAGS: '-L "c:/msys64/mingw64/lib"'
-#       CFLAGS: '-I "c:/msys64/mingw64/include"'
-#    - name: make clean Windows
-#      if: ${{ startsWith(matrix.target, 'windows') }}
-#      run: make -f Makefile.win clean
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v3
     - name: make Windows MSVC

Makefile.msvc64

@@ -9,11 +9,11 @@ MAKEFILE = Makefile.msvc64
 BUILDDIR = ../bin64/
 CC = cl
 CFLAGS = /nologo /MT /W3 /Ox /EHs- /GS /GA /GF /D "MSVC"  /D "WITH_SSL" /D "WITH_WSAPOLL" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "PRINTF_INT64_MODIFIER=\"I64\"" /Fp"proxy.pch" /FD /c
-!IFDEF VERSION
-CFLAGS = $CFLAGS /D $VERSION
+!IFDEF RELEASE
+CFLAGS = $CFLAGS /D "VERSION=\"3proxy-$RELEASE\""
 !ENDIF
-!IFDEF BUILDDATE
-CFLAGS = $CFLAGS /D $BUILDDATE
+!IFDEF NOW
+CFLAGS = $CFLAGS /D "BUILDDATE=\"$NOW\""
 !ENDIF
 COUT = /Fo
 LN = link