diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2017-10-23 17:55:31 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-10-25 17:44:19 +0300 |
| commit | 82e2421819dbf130172c3b5c9ec9b2ec77a5e6a4 (patch) | |
| tree | 0123444118a3e017ab055333a54f0d6451c81bc1 /msvc/libmonoutils-arch.targets | |
| parent | e3c239ccdc189de84e93e8a634f1acf0c137edd3 (diff) | |
Build fixes for none Windows desktop platforms.
* Exclude a couple of sources currently not building anything useful on Windows.
* Added MONO_EMTPY_SOURCE_FILE to a couple of source files ending up empty by default.
* Excluded API's not included on UWP targets.
* Explicitly declared import project paths in target files.
* Added support to define x64 MASM build outside default targets file.
Diffstat (limited to 'msvc/libmonoutils-arch.targets')
| -rw-r--r-- | msvc/libmonoutils-arch.targets | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/msvc/libmonoutils-arch.targets b/msvc/libmonoutils-arch.targets index 041daa7863d..96bfd8bb5e9 100644 --- a/msvc/libmonoutils-arch.targets +++ b/msvc/libmonoutils-arch.targets @@ -2,11 +2,18 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild> + </PropertyGroup> + <PropertyGroup Condition="'$(ExcludeFromWindows32Build)'==''"> <ExcludeFromWindows32Build>false</ExcludeFromWindows32Build> - <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build> <ExcludeFromWindows32Build Condition="'$(Platform)'=='Win32'">true</ExcludeFromWindows32Build> + </PropertyGroup> + <PropertyGroup Condition="'$(ExcludeFromWindows64Build)'==''"> + <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build> <ExcludeFromWindows64Build Condition="'$(Platform)'=='x64'">true</ExcludeFromWindows64Build> </PropertyGroup> + <PropertyGroup Condition="'$(ExcludeMASMFromWindowsBuild)'==''"> + <ExcludeMASMFromWindowsBuild>false</ExcludeMASMFromWindowsBuild> + </PropertyGroup> <ItemGroup Label="arch_x86_sources"> <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c"> <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> @@ -17,7 +24,7 @@ <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c"> <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild> </ClCompile> - <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm"> + <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm" Condition="'$(ExcludeMASMFromWindowsBuild)'=='false'"> <FileType>Document</FileType> <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild> <PreprocessorDefinitions>X64</PreprocessorDefinitions> @@ -75,7 +82,7 @@ </ClCompile> </ItemGroup> <ImportGroup Label="ExtensionSettings"> - <Import Project="$(MonoSourceLocation)\msvc\masm.fixed.props" /> + <Import Project="$(MSBuildThisFileDirectory)masm.fixed.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" /> </ImportGroup> </Project> |