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 b765083 Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS b765083 is described below commit b7650833fa497cb24317d7981a48255be4d408b9 Author: Mladen Turk <mt...@apache.org> AuthorDate: Sat Jun 13 16:48:24 2020 +0200 Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS --- native/apache-2.0/Makefile.vc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc index ad8f18b..8084f7d 100644 --- a/native/apache-2.0/Makefile.vc +++ b/native/apache-2.0/Makefile.vc @@ -26,12 +26,12 @@ MT = mt.exe !IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == "" APACHE2_LDIR=$(APACHE2_HOME)\lib !ENDIF -!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == "" -APACHE2_INCS=$(APACHE2_HOME)\include +!IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == "" +APACHE2_IDIR=$(APACHE2_HOME)\include !ENDIF LIB = $(LIB);$(APACHE2_LDIR) -INCLUDE = $(INCLUDE);$(APACHE2_INCS) +INCLUDE = $(INCLUDE);$(APACHE2_IDIR) !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == "" !ERROR Must specify BUILD_CPU matching compiler x86 or x64 @@ -58,10 +58,10 @@ MAKEWORKDIR = md $(WORKDIR) NMAKE_WINVER=0x0700 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS) -CFLAGS = $(CFLAGS) +CFLAGS = $(CFLAGS) $(EXTRA_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) +LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE) $(EXTRA_LDLAGS) LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib $(APACHE2_LIBS) $(EXTRA_LIBS) INCDIR = -I..\common @@ -100,7 +100,7 @@ $(WORKDIR) : $(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $< $(BUILDRES): ..\common\jk.rc - $(RC) /l 0x409 /i "..\common" /d "MOD_JK" /d "NDEBUG" /fo $(BUILDRES) $@ + $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@ $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN) /pdb:$(BUILDPDB) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org