diff options
| author | Johan Lorensson <lateralusx.github@gmail.com> | 2018-10-29 01:18:28 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2018-10-29 01:18:28 +0300 |
| commit | 1ec7ac543849ebf1e91aeb47890c91041d3fc27a (patch) | |
| tree | bacdb43239df3d56ccc31a960d5eb89355a50d30 /Makefile.am | |
| parent | 668933de7f65767d17dcf684f78d2f17824575f9 (diff) | |
Add option to integrate msvc build into regular make build. (#11343)
* Integrate msvc build into make build system.
Add support to perform msvc build as part of regular make build. By default
msvc build will not automatically be done and needs to be enabled using
--with-msvc argument passed to ./autogen.sh. Doing msvc build as part of
regular make will automatically set MONO_EXECUTABLE to build msvc build
Mono runtime used in BCL and Test build as well as runtime used when running
tests.
* Add support to install msvc build mono runtime.
* Disable --with-msvc argument for none Windows builds.
* Fix VS2015 Build Tools build environment.
* Updated with review feedback switching to --enable-msvc.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 9f89c00e920..9d101fa1c65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,17 @@ else tools_dir = tools endif -SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests +if ENABLE_MSVC +build_with_msvc = msvc +build_without_msvc = +else +build_with_msvc = +build_without_msvc = msvc +endif + +SUBDIRS = $(build_with_msvc) mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) $(build_without_msvc) $(docs_dir) acceptance-tests # Keep in sync with SUBDIRS -DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests +DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests all: update_submodules |