This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new faec73d Use correct windows WINVER
faec73d is described below
commit faec73d7d76a9fc51c9689397286710ce198da61
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 17:28:02 2020 +0200
Use correct windows WINVER
---
native/apache-2.0/Makefile.vc | 6 ++++--
native/iis/Makefile.vc | 8 +++++---
native/iis/pcre/Makefile.vc | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 8084f7d..72f3cdf 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -43,6 +43,9 @@ MACHINE = X86
CPUFLAGS = -DWIN64 -D_WIN64
MACHINE = AMD64
!ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
# Modify library names or list them when calling nmake
APACHE2_LIBS = libhttpd.lib libapr-1.lib libaprutil-1.lib
@@ -55,9 +58,8 @@ BUILDMFT = $(BUILDBIN).manifest
WORKDIR = $(BUILD_CPU)_RELEASE
CLEANTARGET = rd /s /q $(WORKDIR)
MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER)
-DWINVER=$(WINVER) $(CPUFLAGS)
CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 817ab50..c745481 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -30,6 +30,9 @@ MACHINE = X86
CPUFLAGS = -DWIN64 -D_WIN64
MACHINE = AMD64
!ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDRES = $(WORKDIR)\$(PROJECT).res
@@ -40,8 +43,7 @@ PCRELIB = .\pcre\$(WORKDIR)\pcre.lib
WORKDIR = $(BUILD_CPU)_RELEASE
CLEANTARGET = rd /s /q $(WORKDIR)
MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H
$(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER)
-DWINVER=$(WINVER) -DHAVE_CONFIG_H $(CPUFLAGS)
CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS $(EXTRA_CFLAGS)
CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
@@ -88,7 +90,7 @@ $(BUILDRES): ..\common\jk.rc
$(PCRELIB):
@cd .\pcre
- $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER)
BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
+ $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU)
CPUFLAGS="$(CPUFLAGS)"
@if not ERRORLEVEL 0 exit /B 1
@cd ..
diff --git a/native/iis/pcre/Makefile.vc b/native/iis/pcre/Makefile.vc
index 25b05a8..9fb9306 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -28,7 +28,7 @@ WORKDIR = $(BUILD_CPU)_RELEASE
BUILDLIB = $(WORKDIR)\$(PROJECT).lib
CLEANTARGET = rd /s /q $(WORKDIR)
MAKEWORKDIR = md $(WORKDIR)
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER)
-DWINVER=$(WINVER)
CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS) $(EXTRA_CFLAGS)
CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
