This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit d2bbadafe6fda3c216580e8a00251fdf3ce18202
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 25 17:13:27 2019 +0100
Make file fixes to enable building with APR 1.7.x
---
native/NMAKEmakefile.inc | 13 ++++++-------
native/srclib/apr/NMAKEmakefile | 2 +-
xdocs/miscellaneous/changelog.xml | 1 +
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index d250fc7..69f7b32 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -30,13 +30,12 @@
# PROCESSOR_ARCHITECTURE environment variable
# or to the X86 if not specified.
# WINVER Compile for specified Windows version
-# WINNT for Windows 2000 and up(default)
-# WINXP for Windows XP and up
-# WIN2003 for Windows 2003 and up
-# VSITA for Windows Vista and up
+# WIN7 for Windows 7 and up (default)
# Deprecated targets (may not even compile):
-# NT4 for Windows NT4 and up
-# WIN9X for Windows 95, 98 and Me
+# WIN2003 for Windows 2003 and up
+# VISTA for Windows Vista and up
+# WINXP for Windows XP and up
+# WINNT for Windows 2000 and up
# BUILD Build version
# RETAIL or RELEASE (default)
# DEBUG
@@ -140,7 +139,7 @@ TARGET=EXE
!ENDIF
!IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WINXP
+WINVER=WIN7
!ENDIF
diff --git a/native/srclib/apr/NMAKEmakefile b/native/srclib/apr/NMAKEmakefile
index 868000b..1d760a3 100644
--- a/native/srclib/apr/NMAKEmakefile
+++ b/native/srclib/apr/NMAKEmakefile
@@ -45,7 +45,7 @@ SRCDIR = .
!IF "$(TARGET)" != "LIB"
LFLAGS = $(LFLAGS) /version:1.4
!ENDIF
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch
-I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch
-I$(SRCDIR)\include\private -I$(SRCDIR)\include\arch\win32
-I$(SRCDIR)\include\arch\unix
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
OBJECTS = \
$(WORKDIR)\apr_atomic.obj \
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 4d0d8ba..ea091a2 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -36,6 +36,7 @@
</section>
<section name="Changes in 1.2.23">
<changelog>
+ Make file fixes to enable building with APR 1.7.x. (markt)
</changelog>
</section>
<section name="Changes in 1.2.22">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
