diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2016-04-12 15:14:58 +0300 |
|---|---|---|
| committer | lateralusX <lateralusx.github@gmail.com> | 2016-06-15 10:40:06 +0300 |
| commit | 51870b34bd1810497f2f77c1bc4c960a1fe614f2 (patch) | |
| tree | 877d3c9a6a898f7f9d5f1acd385e3dfd8e4846ed /msvc/mono.props | |
| parent | b1c604eee2bf5f80c14d4708424a1606894bb5b9 (diff) | |
Better property manager and user macros support.
* Added support for user macros in order to set build/install/sgen.
* Added support for more arguments to bat files + support for quoted paths.
* Added support for verbose/quite output in bat files.
* Moved libmono xcopy post build step into separate bat file.
* Cleaned some sgen configs still left in vcxprojs.
Diffstat (limited to 'msvc/mono.props')
| -rw-r--r-- | msvc/mono.props | 61 |
1 files changed, 33 insertions, 28 deletions
diff --git a/msvc/mono.props b/msvc/mono.props index a5f7c26377b..93ec4fe99c6 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -1,49 +1,54 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - <PropertyGroup Label="MonoBuild"> - <top_srcdir>$(MSBuildProjectDirectory)\..</top_srcdir> - <MONO_DIR>$(top_srcdir)</MONO_DIR> - <MONO_BUILD_DIR_PREFIX>c:\mono-build\</MONO_BUILD_DIR_PREFIX> - <MONO_INSTALL_DIR_PREFIX>c:\mono-dist\</MONO_INSTALL_DIR_PREFIX> - <MONO_USE_SGEN>true</MONO_USE_SGEN> + <ItemGroup> + <BuildMacro Include="MONO_BUILD_DIR_PREFIX"> + <Value>$(MONO_BUILD_DIR_PREFIX)</Value> + <EnvironmentVariable>true</EnvironmentVariable> + </BuildMacro> + <BuildMacro Include="MONO_INSTALL_DIR_PREFIX"> + <Value>$(MONO_INSTALL_DIR_PREFIX)</Value> + <EnvironmentVariable>true</EnvironmentVariable> + </BuildMacro> + <BuildMacro Include="MONO_USE_SGEN"> + <Value>$(MONO_USE_SGEN)</Value> + <EnvironmentVariable>true</EnvironmentVariable> + </BuildMacro> + </ItemGroup> + <PropertyGroup Label="UserMacros"> + <MONO_BUILD_DIR_PREFIX>c:\mono-build\</MONO_BUILD_DIR_PREFIX> + <MONO_INSTALL_DIR_PREFIX>c:\mono-dist\</MONO_INSTALL_DIR_PREFIX> + <MONO_USE_SGEN>true</MONO_USE_SGEN> </PropertyGroup> - - <PropertyGroup Label="MonoIncludes"> - <MONO_INCLUDE_DIR>$(MONO_DIR)\mono</MONO_INCLUDE_DIR> + <PropertyGroup Label="MonoDirectories"> + <top_srcdir>$(MSBuildProjectDirectory)\..</top_srcdir> + <MONO_DIR>$(top_srcdir)</MONO_DIR> + <MONO_INCLUDE_DIR>$(MONO_DIR)\mono</MONO_INCLUDE_DIR> <MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)\eglib;$(MONO_DIR)\eglib\include;$(MONO_DIR)\eglib\test</MONO_EGLIB_INCLUDE_DIR> <MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)\eglib\src</MONO_EGLIB_SOURCE_DIR> - <MONO_LIBGC_INCLUDE_DIR>$(MONO_DIR)\libgc\include</MONO_LIBGC_INCLUDE_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_JIT_INCLUDE_DIR>$(MONO_INCLUDE_DIR)\jit</MONO_JIT_INCLUDE_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> + <LIBGC_CPPFLAGS_INCLUDE>$(MONO_LIBGC_INCLUDE_DIR)</LIBGC_CPPFLAGS_INCLUDE> <GLIB_CFLAGS_INCLUDE>$(MONO_EGLIB_SOURCE_DIR)</GLIB_CFLAGS_INCLUDE> </PropertyGroup> - <PropertyGroup Label="MonoSGEN" Condition="$(MONO_USE_SGEN)==true"> <SGEN_DEFINES>HAVE_SGEN_GC;HAVE_MOVING_COLLECTOR;HAVE_WRITE_BARRIERS</SGEN_DEFINES> - <GC_DEFINES>$(SGEN_DEFINES)</GC_DEFINES> + <GC_DEFINES>$(SGEN_DEFINES)</GC_DEFINES> <GC_LIB>libgcmonosgen.lib</GC_LIB> - <MONO_DEF>monosgen.def</MONO_DEF> - <MONO_TARGET_SUFFIX>-sgen</MONO_TARGET_SUFFIX> + <MONO_DEF>monosgen.def</MONO_DEF> + <MONO_TARGET_SUFFIX>-sgen</MONO_TARGET_SUFFIX> </PropertyGroup> - <PropertyGroup Label="MonoBOEHM" Condition="$(MONO_USE_SGEN)==false"> - <BOEHM_DEFINES>HAVE_BOEHM_GC</BOEHM_DEFINES> + <BOEHM_DEFINES>HAVE_BOEHM_GC</BOEHM_DEFINES> <GC_DEFINES>$(HAVE_BOEHM_GC)</GC_DEFINES> - <GC_LIB>libgc.lib</GC_LIB> - <MONO_DEF>mono.def</MONO_DEF> - <MONO_TARGET_SUFFIX></MONO_TARGET_SUFFIX> + <GC_LIB>libgc.lib</GC_LIB> + <MONO_DEF>mono.def</MONO_DEF> + <MONO_TARGET_SUFFIX>-boehm</MONO_TARGET_SUFFIX> </PropertyGroup> - <PropertyGroup Label="MonoProfiler"> <VTUNE_INCLUDE_DIR>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\include</VTUNE_INCLUDE_DIR> </PropertyGroup> - - <ItemGroup /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> <ItemDefinitionGroup> <ClCompile> <DllExportPreprocessorDefinitions>MONO_DLL_EXPORT</DllExportPreprocessorDefinitions> |