summaryrefslogtreecommitdiffstats
path: root/Makefile.win
diff options
context:
space:
mode:
authorGregg Lewis Smith <gsmith@apache.org>2015-08-27 00:14:16 +0200
committerGregg Lewis Smith <gsmith@apache.org>2015-08-27 00:14:16 +0200
commit98077e4911cfb100da4c8411ac16261cb77f40d3 (patch)
treee383bc6119f69a0a5629c78b7bca6753453e9481 /Makefile.win
parentmotorz: fix a compiler warning. (diff)
downloadapache2-98077e4911cfb100da4c8411ac16261cb77f40d3.tar.xz
apache2-98077e4911cfb100da4c8411ac16261cb77f40d3.zip
Windows traditional build files for mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698023 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
-rw-r--r--Makefile.win32
1 files changed, 32 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win
index 774d7f29a1..78ffd58f27 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -245,6 +245,30 @@ _trylua:
!ENDIF
+!IF EXIST("srclib\nghttp2")
+
+_trynghttp2:
+!IF $(USEMAK) == 1
+ cd modules\http2
+ $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
+!ELSEIF $(USESLN) == 1
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2
+!ELSE
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+# NOT EXIST("srclib\lua")
+
+_trynghttp2:
+ @echo -----
+ @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.
+ @echo Version 1.0 includes an lib\makefile.msvc that will satisfy this
+ @echo requirement.
+
+!ENDIF
_trydb:
!IF $(USEMAK) == 1
@@ -799,6 +823,14 @@ _copybin:
copy modules\generators\$(LONG)\mod_info.$(src_so) "$(inst_so)" <.y
copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y
copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y
+!IF EXIST("srclib\nghttp2")
+ copy modules\http2\$(LONG)\mod_h2.$(src_so) "$(inst_so)" <.y
+!IF "$(SHORT)" == "D"
+ copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y
+!ELSE
+ copy srclib\nghttp2\lib\MSVC_obj\nghttp2.$(src_dll) "$(inst_dll)" <.y
+!ENDIF
+!ENDIF
copy modules\ldap\$(LONG)\mod_ldap.$(src_so) "$(inst_so)" <.y
copy modules\loggers\$(LONG)\mod_log_config.$(src_so) "$(inst_so)" <.y
copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) "$(inst_so)" <.y