diff options
| author | Jonathan Chambers <joncham@gmail.com> | 2019-11-22 20:03:23 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2019-11-22 20:03:23 +0300 |
| commit | cc137237d86b0553e844dc34c9a3cbc5b20782c0 (patch) | |
| tree | 15916aff0cc2f69939401e7f591cbedd31027f50 /msvc/mono.props | |
| parent | 0fed03ed63ed4ea742c4511d8edc3bc1c6f4044f (diff) | |
Replace embedded libgc with Unity fork of recent Boehm (bdwgc) (#16832)
* Initial commit to migrate libgc to bdwgc.
* Fix submodule url
* Don't force Boehm as runtime wrapper. Was just for testing locally.
* Build bdwgc as single object file. Helps with performance.
* Bump bdwgc submodule.
* Attempt to fix windows MSVC based build.
* Remove any references to GC_INSIDE_DLL as we manually managed threads on Windows.
* Allow building boehm on Windows amd64.
* Allow building boehm with msvc.
* Bump bdwgc to fix line endings
* Use LF for sh, am, m4, and ac files in bdwgc
* Bump bdwgc & libatomic_ops with fix for cygwin
* Bump bdwgc to fix mono-boehm being generated as libtool wrapper script.
* Link the static boehm library.
* Revert "Link the static boehm library."
This reverts commit 1f90d81d08308a61c890743cd79d8f6bb791bc99.
* Use --export-all-symbols on cygwin/mingw to fix issues with boehm causing mono symbols not to be exported.
* Fix
Diffstat (limited to 'msvc/mono.props')
| -rw-r--r-- | msvc/mono.props | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/msvc/mono.props b/msvc/mono.props index 88fb969fedf..d9f6af48dc0 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -37,8 +37,8 @@ <MONO_INCLUDE_DIR>$(MONO_DIR)/mono</MONO_INCLUDE_DIR> <MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_INCLUDE_DIR> <MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_SOURCE_DIR> - <MONO_LIBGC_INCLUDE_DIR>$(MONO_DIR)/libgc/include</MONO_LIBGC_INCLUDE_DIR> - <MONO_LIBGC_SOURCE_DIR>$(MONO_DIR)/libgc/src</MONO_LIBGC_SOURCE_DIR> + <MONO_LIBGC_INCLUDE_DIR>$(MONO_DIR)/external/bdwgc/include;$(MONO_DIR)/external/bdwgc/libatomic_ops/src</MONO_LIBGC_INCLUDE_DIR> + <MONO_LIBGC_SOURCE_DIR>$(MONO_DIR)/external/bdwgc</MONO_LIBGC_SOURCE_DIR> <MONO_JIT_INCLUDE_DIR>$(MONO_INCLUDE_DIR)/jit</MONO_JIT_INCLUDE_DIR> <MONO_JIT_SOURCE_DIR>$(MONO_INCLUDE_DIR)/jit</MONO_JIT_SOURCE_DIR> <LIBGC_CPPFLAGS_INCLUDE>$(MONO_LIBGC_INCLUDE_DIR)</LIBGC_CPPFLAGS_INCLUDE> @@ -121,7 +121,8 @@ </BuildMacro> </ItemGroup> <PropertyGroup Label="MonoDefaultPreprocessorDefinitions"> - <MONO_PREPROCESSOR_DEFINITIONS>__default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;NVALGRIND;$(MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS)</MONO_PREPROCESSOR_DEFINITIONS> + <HAVE_CONFIG_H_DEFINE Condition="'$(MonoDisableHaveConfigH)'!='true'">HAVE_CONFIG_H</HAVE_CONFIG_H_DEFINE> + <MONO_PREPROCESSOR_DEFINITIONS>__default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(HAVE_CONFIG_H_DEFINE);GC_NOT_DLL;WIN32_THREADS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;NVALGRIND;$(MONO_ADDITIONAL_PREPROCESSOR_DEFINITIONS)</MONO_PREPROCESSOR_DEFINITIONS> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> |