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 ef416f7 Pass common flags to pcre makefile
ef416f7 is described below
commit ef416f7a6c5500b3f1232907097b9325b6379b38
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 16:59:38 2020 +0200
Pass common flags to pcre makefile
---
native/iis/Makefile.vc | 8 ++++----
native/iis/pcre/Makefile.vc | 12 +++---------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 4d3de57..817ab50 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -42,10 +42,10 @@ 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) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
+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)
-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_LDFLAGS)
LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib $(EXTRA_LIBS)
INCDIR = -I.\pcre -I..\common
@@ -84,11 +84,11 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
$(BUILDRES): ..\common\jk.rc
- $(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES)
..\common\jk.rc
+ $(RC)/l 0x409 /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) $@
$(PCRELIB):
@cd .\pcre
- $(MAKE) -f Makefile.vc
+ $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_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 da07d88..25b05a8 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -23,22 +23,16 @@ MT = mt.exe
!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
!ERROR Must specify BUILD_CPU matching compiler x86 or x64
!ENDIF
-!IF "$(BUILD_CPU)" == "z86"
-CPUFLAGS = -D_X86_=1
-!ELSE
-CPUFLAGS = -DWIN64 -D_WIN64
-!ENDIF
-BUILDLIB = $(WORKDIR)\$(PROJECT).lib
WORKDIR = $(BUILD_CPU)_RELEASE
+BUILDLIB = $(WORKDIR)\$(PROJECT).lib
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)
-CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS)
+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)
-LFLAGS = -lib /nologo
+LFLAGS = -lib /nologo $(EXTRA_LFLAGS)
OBJECTS = \
$(WORKDIR)\pcre_byte_order.obj \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
