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 15a6fd0 Add httpd lib and include to system paths
15a6fd0 is described below
commit 15a6fd099f8a640f36b12064ee9db4d76408aaa8
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 16:38:37 2020 +0200
Add httpd lib and include to system paths
---
native/apache-2.0/Makefile.vc | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 28f0e8f..ad8f18b 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -23,6 +23,15 @@ MT = mt.exe
!IF !DEFINED(APACHE2_HOME) || "$(APACHE2_HOME)" == ""
!ERROR Cannot find APACHE2_HOME. Use nmake -f Makefile.vc APACHE2_HOME=dir
!ENDIF
+!IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == ""
+APACHE2_LDIR=$(APACHE2_HOME)\lib
+!ENDIF
+!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == ""
+APACHE2_INCS=$(APACHE2_HOME)\include
+!ENDIF
+
+LIB = $(LIB);$(APACHE2_LDIR)
+INCLUDE = $(INCLUDE);$(APACHE2_INCS)
!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
!ERROR Must specify BUILD_CPU matching compiler x86 or x64
@@ -52,9 +61,9 @@ CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT
-D_WIN32_WINNT=$(NMAKE_WINV
CFLAGS = $(CFLAGS)
CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS
/MACHINE:$(MACHINE) /libpath:$(APACHE2_HOME)\lib
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS
/MACHINE:$(MACHINE)
LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
$(APACHE2_LIBS) $(EXTRA_LIBS)
-INCDIR = -I..\common -I$(APACHE2_HOME)\include
+INCDIR = -I..\common
OBJECTS = \
$(WORKDIR)\jk_ajp12_worker.obj \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
