github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2931 from leancz/leancz-patch-1-pcre2-windows

Browse Source 
Adding PCRE2 support for windows build in Makefile.win
This commit is contained in:
Marc Stern 2024-02-01 12:24:47 +01:00 committed by GitHub
commit d686d1344d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apache2/Makefile.win
View File

@ -1,29 +1,37 @@
########################################################################### ###########################################################################
# #
# Usage: NMAKE -f Makefile.win APACHE={httpd installion dir} PCRE={pcre dir} LIBXML2={LibXML2 dir} [ LUA={Lua dir} ] # Usage: NMAKE -f Makefile.win APACHE={httpd installion dir} PCRE|PCRE2={pcre dir} LIBXML2={LibXML2 dir} [ LUA={Lua dir} ]
# #
!IF "$(PCRE2)" != ""
PCRE = $(PCRE2)
!ENDIF
!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == "" !IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == ""
!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir CURL=dir are required to build mod_security2 for Windows !ERROR NMAKE arguments: APACHE=dir PCRE|PCRE2=dir LIBXML2=dir CURL=dir are required to build mod_security2 for Windows
!ENDIF !ENDIF
# Linking libraries # Linking libraries
LIBS = $(APACHE)\lib\libhttpd.lib \ LIBS = $(APACHE)\lib\libhttpd.lib \
$(APACHE)\lib\libapr-1.lib \ $(APACHE)\lib\libapr-1.lib \
$(APACHE)\lib\libaprutil-1.lib \ $(APACHE)\lib\libaprutil-1.lib \
$(PCRE)\pcre.lib \ $(CURL)\libcurl.lib \
$(CURL)\libcurl.lib \
$(LIBXML2)\win32\bin.msvc\libxml2.lib \ $(LIBXML2)\win32\bin.msvc\libxml2.lib \
Ws2_32.lib \ Ws2_32.lib \
"iphlpapi.lib" "iphlpapi.lib"
!IF "$(PCRE2)" != ""
LIBS =$(LIBS) $(PCRE2)\lib\pcre2-8.lib
!ELSE
LIBS =$(LIBS) $(PCRE)\lib\pcre.lib
!ENDIF
########################################################################### ###########################################################################
########################################################################### ###########################################################################
!IF "$(IIS_BUILD)" == "yes" !IF "$(IIS_BUILD)" == "yes"
DEFS=$(DEFS) -DVERSION_IIS DEFS=$(DEFS) -DVERSION_IIS
!ENDIF !ENDIF
CC = CL CC = CL
MT = mt MT = mt
@ -37,9 +45,14 @@ INCLUDES = -I. -I.. \
-I$(PCRE)\include -I$(PCRE) \ -I$(PCRE)\include -I$(PCRE) \
-I$(LIBXML2)\include \ -I$(LIBXML2)\include \
-I$(APACHE)\include -I$(APACHE)\include
# Enables support for SecRemoteRules and external resources. # Enables support for SecRemoteRules and external resources.
DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
# Enable PCRE2
!IF "$(PCRE2)" != ""
DEFS =$(DEFS) -DWITH_PCRE2
!ENDIF
# Lua is optional # Lua is optional
!IF "$(LUA)" != "" !IF "$(LUA)" != ""
@ -65,8 +78,8 @@ OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \ msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \ msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \
msc_release.obj \ msc_release.obj \
msc_status_engine.obj \ msc_status_engine.obj \
msc_remote_rules.obj \ msc_remote_rules.obj \
msc_json.obj \ msc_json.obj \
libinjection/libinjection_html5.obj \ libinjection/libinjection_html5.obj \
libinjection/libinjection_sqli.obj \ libinjection/libinjection_sqli.obj \