diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2018-01-19 03:46:06 +0100 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2018-01-19 03:46:06 +0100 |
| commit | 0da57e874807c0285ae9e99ce9c5e27b7a81bb4d (patch) | |
| tree | 67db4f8343a97cdb454b94e4771721e8acf9cba9 /Makefile.win | |
| parent | some small tweaks to get things building again (diff) | |
| download | apache2-0da57e874807c0285ae9e99ce9c5e27b7a81bb4d.tar.xz apache2-0da57e874807c0285ae9e99ce9c5e27b7a81bb4d.zip | |
get mod_brotli in build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821582 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index 4ec79e9225..32c92a00f6 100644 --- a/Makefile.win +++ b/Makefile.win @@ -274,6 +274,33 @@ _trynghttp2: !ENDIF +!IF EXIST("srclib\brotli") + +_trybrotli: +!IF $(USEMAK) == 1 + cd modules\filters + $(MAKE) $(MAKEOPT) -f mod_brotli.mak CFG="mod_brotli - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_brotli +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_brotli - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\brotli") + +_trybrotli: + @echo ----- + @echo mod_brotli will not build unless brotli is built in srclib\brotli. + @echo Version 1.0.0 and later available from https://github.com/google/brotli/releases + @echo build with: + @echo cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF + @echo nmake + +!ENDIF + !IF EXIST("srclib\openssl") && EXIST("srclib\jansson") && EXIST("srclib\curl") _trymd: @@ -536,6 +563,9 @@ _build: cd ..\.. !ENDIF cd modules\filters +!IF EXIST("srclib\brotli") + $(MAKE) $(MAKEOPT) -f mod_brotli.mak CFG="mod_brotli - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF $(MAKE) $(MAKEOPT) -f mod_buffer.mak CFG="mod_buffer - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_data.mak CFG="mod_data - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -834,6 +864,9 @@ _copybin: copy modules\examples\$(LONG)\mod_example_hooks.$(src_so) "$(inst_so)" <.y copy modules\examples\$(LONG)\mod_example_ipc.$(src_so) "$(inst_so)" <.y !ENDIF +!IF EXIST("srclib\brotli") + copy modules\filters\$(LONG)\mod_brotli.$(src_so) "$(inst_so)" <.y +!ENDIF copy modules\filters\$(LONG)\mod_buffer.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y copy modules\filters\$(LONG)\mod_data.$(src_so) "$(inst_so)" <.y |