Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlateralusX <lateralusx.github@gmail.com>2017-10-23 17:55:31 +0300
committerMarek Safar <marek.safar@gmail.com>2017-10-25 17:44:19 +0300
commit82e2421819dbf130172c3b5c9ec9b2ec77a5e6a4 (patch)
tree0123444118a3e017ab055333a54f0d6451c81bc1 /msvc/libmonoutils-arch.targets.filters
parente3c239ccdc189de84e93e8a634f1acf0c137edd3 (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.filters')
-rw-r--r--msvc/libmonoutils-arch.targets.filters5
1 files changed, 4 insertions, 1 deletions
diff --git a/msvc/libmonoutils-arch.targets.filters b/msvc/libmonoutils-arch.targets.filters
index 836b30fb65d..8498d9780c9 100644
--- a/msvc/libmonoutils-arch.targets.filters
+++ b/msvc/libmonoutils-arch.targets.filters
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(ExcludeMASMFromWindowsBuild)'==''">
+ <ExcludeMASMFromWindowsBuild>false</ExcludeMASMFromWindowsBuild>
+ </PropertyGroup>
<ItemGroup Label="arch_x86_sources">
<ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
<Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\x86</Filter>
@@ -12,7 +15,7 @@
<ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
<Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
</ClCompile>
- <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+ <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm" Condition="'$(ExcludeMASMFromWindowsBuild)'=='false'">
<Filter>Resource Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
</MASM>
</ItemGroup>