diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-05-20 22:11:41 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-05-20 22:11:41 +0200 |
| commit | bec200611bb6ce1d839320d8c6da4509d85dd318 (patch) | |
| tree | 8845b5b750492ced20f837926d2b81f0976f2c5f | |
| parent | Add mod_proxy_http2 based on CMakeLists.txt prereqs (diff) | |
| download | apache2-bec200611bb6ce1d839320d8c6da4509d85dd318.tar.xz apache2-bec200611bb6ce1d839320d8c6da4509d85dd318.zip | |
Support build files for mod_proxy_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1744792 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Apache-apr2.dsw | 24 | ||||
| -rw-r--r-- | Apache.dsw | 27 | ||||
| -rw-r--r-- | Makefile.win | 8 | ||||
| -rw-r--r-- | os/win32/BaseAddr.ref | 1 |
4 files changed, 59 insertions, 1 deletions
diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 538140e041..25b6823710 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -2396,6 +2396,30 @@ Package=<4> ############################################################################### +Project: "mod_proxy_http2"=.\modules\http2\mod_proxy_http2.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_http2 + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_proxy + End Project Dependency +}}} + +############################################################################### + Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index 20e64fcbe3..9dcb224115 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -2813,6 +2813,33 @@ Package=<4> ############################################################################### +Project: "mod_proxy_http2"=.\modules\http2\mod_proxy_http2.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libaprutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_http2 + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_proxy + End Project Dependency +}}} + +############################################################################### + Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 5be292fcfc..3b1509ade9 100644 --- a/Makefile.win +++ b/Makefile.win @@ -251,12 +251,16 @@ _trynghttp2: !IF $(USEMAK) == 1 cd modules\http2 $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !ELSEIF $(USESLN) == 1 devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_http2 !ELSE @msdev $(TLP).dsw /USEENV /MAKE \ "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_proxy_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !ELSE @@ -539,7 +543,8 @@ _build: cd ..\.. !IF EXIST("srclib\nghttp2") cd modules\http2 - $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. !ENDIF cd modules\loggers @@ -830,6 +835,7 @@ _copybin: copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y !IF EXIST("srclib\nghttp2") copy modules\http2\$(LONG)\mod_http2.$(src_so) "$(inst_so)" <.y + copy modules\http2\$(LONG)\mod_proxy_http2.$(src_so) "$(inst_so)" <.y !IF "$(SHORT)" == "D" copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y !ELSE diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 37c336cd46..418a7a258d 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -132,4 +132,5 @@ mod_optional_hook_export.so 0x70C40000 0x00010000 mod_optional_hook_import.so 0x70C50000 0x00010000 mod_policy.so 0x70C60000 0x00020000 mod_ssl_ct.so 0x70C80000 0x00020000 +mod_proxy_http2.so 0x70CC0000 0x00030000 mod_http2.so 0x70D00000 0x00030000 |