projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f3ca07)
Updated with review feedback.
authorlateralusX <lateralusx.github@gmail.com>
Fri, 29 Sep 2017 12:19:44 +0000 (14:19 +0200)
committerlateralusX <lateralusx.github@gmail.com>
Tue, 3 Oct 2017 07:20:12 +0000 (09:20 +0200)
18 files changed:
msvc/README patch | blob | history
msvc/eglib-posix.targets patch | blob | history
msvc/eglib-win32.targets patch | blob | history
msvc/libgc.targets patch | blob | history
msvc/libgcmonosgen.targets patch | blob | history
msvc/libmini-arch.targets patch | blob | history
msvc/libmini-interp.targets patch | blob | history
msvc/libmini-llvm.targets patch | blob | history
msvc/libmini-posix.targets patch | blob | history
msvc/libmonoruntime-common.targets patch | blob | history
msvc/libmonoruntime-posix.targets patch | blob | history
msvc/libmonoruntime-posix.targets.filters patch | blob | history
msvc/libmonoruntime-win32.targets.filters patch | blob | history
msvc/libmonoutils-arch.targets patch | blob | history
msvc/libmonoutils-arch.targets.filters patch | blob | history
msvc/libmonoutils-common.targets patch | blob | history
msvc/libmonoutils-posix.targets patch | blob | history
msvc/monoposixhelper.targets patch | blob | history

diff --git a/msvc/README b/msvc/README
index 7c6541e0282ab8f4c8d111a582f16f9dd4237f99..375febbdbb20e611fade4d0027c98ea77dcfd2c4 100755 (executable)
--- a/msvc/README
+++ b/msvc/README
@@ -22,12 +22,16 @@ MAINTENANCE
        Files that should not be build on Windows should be excluded  using this configuration:
 
        <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-wasm.c">
        Files that should not be build on Windows should be excluded  using this configuration:
 
        <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-wasm.c">
-               <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-               <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-               <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-               <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+               <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
        </ClCompile>
 
        </ClCompile>
 
+       and at the begning of the target file have a property set when to exclude files. This example will always
+       exclude the file, but could be condtional if needed:
+
+       <PropertyGroup>
+               <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+       </PropertyGroup>
+
        All header files added to makefiles should be included in the different targets files for consistency.
 
        Each target file has a corresponding filter file, files added to target files should also be added to the corresponding
        All header files added to makefiles should be included in the different targets files for consistency.
 
        Each target file has a corresponding filter file, files added to target files should also be added to the corresponding
diff --git a/msvc/eglib-posix.targets b/msvc/eglib-posix.targets
index 3b758dd151e04a5d3f364625218f527c4757f33e..4c1217eb1f33e3cb5e19bb2a64723c2e445e0979 100644 (file)
--- a/msvc/eglib-posix.targets
+++ b/msvc/eglib-posix.targets
@@ -1,41 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-unix.c">
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/eglib-win32.targets b/msvc/eglib-win32.targets
index 2e741df791364b61849162e3f7e37674bbba903c..fbe78bc87f5027db31770c30bea26b54ed1774a4 100644 (file)
--- a/msvc/eglib-win32.targets
+++ b/msvc/eglib-win32.targets
@@ -9,5 +9,5 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c" />
-   </ItemGroup>
+  </ItemGroup>
 </Project>
 </Project>
diff --git a/msvc/libgc.targets b/msvc/libgc.targets
index cf510fb7694ceabbd2f3f41c7b525c4390d165c7..2dfb0bbb30f72b05e440fccaa4881a9acb596851 100644 (file)
--- a/msvc/libgc.targets
+++ b/msvc/libgc.targets
@@ -1,178 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+    <ExcludeBoehmGCFromBuild>true</ExcludeBoehmGCFromBuild>
+    <ExcludeBoehmGCFromBuild Condition="'$(MONO_TARGET_GC)'=='boehm' And '$(Platform)'=='Win32'">false</ExcludeBoehmGCFromBuild>
+  </PropertyGroup>
   <ItemGroup Label="libmonogc_la_sources">
     <ClCompile Include="$(MonoSourceLocation)\libgc\allchblk.c">
   <ItemGroup Label="libmonogc_la_sources">
     <ClCompile Include="$(MonoSourceLocation)\libgc\allchblk.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\alloc.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\alloc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\blacklst.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\blacklst.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\checksums.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\checksums.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\dbg_mlc.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\dbg_mlc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\dyn_load.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\dyn_load.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\finalize.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\finalize.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\gc_dlopen.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\gc_dlopen.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\gcj_mlc.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\gcj_mlc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\headers.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\headers.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\malloc.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\malloc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\mallocx.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\mallocx.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\mark.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\mark.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\mark_rts.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\mark_rts.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\misc.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\misc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\new_hblk.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\new_hblk.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\obj_map.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\obj_map.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\os_dep.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\os_dep.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\pcr_interface.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\pcr_interface.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\ptr_chck.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\ptr_chck.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\real_malloc.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\real_malloc.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\reclaim.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\reclaim.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_pthreads.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_pthreads.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_threads.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\solaris_threads.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\specific.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\specific.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\stubborn.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\stubborn.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\typd_mlc.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\typd_mlc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\backgraph.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\backgraph.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\win32_threads.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\win32_threads.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_support.c">
     <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_support.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_stop_world.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\pthread_stop_world.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\darwin_stop_world.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\darwin_stop_world.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\openbsd_stop_world.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\openbsd_stop_world.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\mach_dep.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\libgc\mach_dep.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gcconfig.h">
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gcconfig.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_priv.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_priv.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_hdrs.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_hdrs.h">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClInclude>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc.h">
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_gcj.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_gcj.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_mark.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_mark.h">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
-         </ClInclude>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_locks.h">
     <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_locks.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeBoehmGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/libgcmonosgen.targets b/msvc/libgcmonosgen.targets
index fc5cc26d5860a62a240951f5cbd5470008521a61..75e62cb0bacd32ec7d3e950f05ebc4b74ab5c067 100644 (file)
--- a/msvc/libgcmonosgen.targets
+++ b/msvc/libgcmonosgen.targets
@@ -1,158 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeSGenGCFromBuild>true</ExcludeSGenGCFromBuild>
+    <ExcludeSGenGCFromBuild Condition="'$(MONO_TARGET_GC)'=='sgen'">false</ExcludeSGenGCFromBuild>
+  </PropertyGroup>
   <ItemGroup Label="monosgen_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h">
   <ItemGroup Label="monosgen_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c">
-                 <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
-         </ClCompile>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h">
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-copy-object.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-copy-object.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h">
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h">
-      <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeSGenGCFromBuild)</ExcludedFromBuild>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/libmini-arch.targets b/msvc/libmini-arch.targets
index 24fc1aadfa0d80d90cccda84301bc19332b2e524..c02878fe9c15e461f396ac8c4a30d1d51518578b 100644 (file)
--- a/msvc/libmini-arch.targets
+++ b/msvc/libmini-arch.targets
@@ -1,231 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+    <ExcludeFromWindows32Build>false</ExcludeFromWindows32Build>
+    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
+    <ExcludeFromWindows32Build Condition="'$(Platform)'=='Win32'">true</ExcludeFromWindows32Build>
+    <ExcludeFromWindows64Build Condition="'$(Platform)'=='x64'">true</ExcludeFromWindows64Build>
+  </PropertyGroup>
   <ItemGroup Label="arch_wasm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-wasm.c">
   <ItemGroup Label="arch_wasm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-wasm.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-wasm.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-wasm.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-wasm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-x86.h"/>
     <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-x86.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-x86.h"/>
     <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-x86.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </CustomBuildStep>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-x86.c">
     </CustomBuildStep>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-x86.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86-gsharedvt.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86-gsharedvt.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows64Build)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h"/>
     <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h"/>
     <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </CustomBuildStep>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-amd64.c">
     </CustomBuildStep>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-amd64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64-gsharedvt.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_ppc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-ppc.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_ppc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-ppc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-ppc.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-ppc.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-ppc.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-ppc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-ppc.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-ppc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-arm.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-arm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm-gsharedvt.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm-gsharedvt.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm64.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm64.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-arm64.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm64.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-arm64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm64.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>    
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm64-gsharedvt.c">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-arm64-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm64-gsharedvt.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm64-gsharedvt.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arm64-gsharedvt.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-arm64-gsharedvt.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_mips_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-mips.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_mips_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-mips.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-mips.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-mips.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-mips.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-mips.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-mips.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-mips.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_sparc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-sparc.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_sparc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-sparc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-sparc.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-sparc.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-sparc.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-sparc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-sparc.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-sparc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_s390x_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-s390x.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_s390x_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-s390x.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-s390x.h"/>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\support-s390x.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-s390x.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-s390x.h"/>
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\support-s390x.h"/>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-s390x.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-s390x.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-s390x.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/libmini-interp.targets b/msvc/libmini-interp.targets
index a3b0e63b84ab9fc1d9eb77b2345984304b3864cb..350b8a66b5d8627b021944c725adc0cbeb0739d1 100644 (file)
--- a/msvc/libmini-interp.targets
+++ b/msvc/libmini-interp.targets
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="interp_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\hacks.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\interp.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\interp-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp.c">
   <ItemGroup Label="interp_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\hacks.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\interp.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\interp-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp-stubs.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\mintops.h" />
     <None Include="$(MonoSourceLocation)\mono\mini\interp\mintops.def" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\mintops.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp-stubs.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\mini\interp\mintops.h" />
     <None Include="$(MonoSourceLocation)\mono\mini\interp\mintops.def" />
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\mintops.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\transform.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\transform.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/libmini-llvm.targets b/msvc/libmini-llvm.targets
index 432b99c24b7ad199843ebcf541c5a1dd17859335..f4b6737f6f4a942579f2063126b19a5bf9ec93c7 100644 (file)
--- a/msvc/libmini-llvm.targets
+++ b/msvc/libmini-llvm.targets
@@ -1,35 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="llvm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm-loaded.c">
   <ItemGroup Label="llvm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm-loaded.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\llvm-runtime.cpp">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\llvm-runtime.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm-cpp.cpp">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-llvm-cpp.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\llvm-jit.cpp">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\llvm-jit.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/libmini-posix.targets b/msvc/libmini-posix.targets
index 39b348a29ef138ab10ad3cfedb0a3db9a1f87d62..121320216802ada8595a42a3cb6ebb8148ec202d 100644 (file)
--- a/msvc/libmini-posix.targets
+++ b/msvc/libmini-posix.targets
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="darwin_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-darwin.c">
   <ItemGroup Label="darwin_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-darwin.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-posix.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-posix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets
index 69f10227f6bd983fe1af3c087ef39a67a3ffdad6..67e0bc8e8379178bed6bec0c983732987292529e 100644 (file)
--- a/msvc/libmonoruntime-common.targets
+++ b/msvc/libmonoruntime-common.targets
@@ -6,16 +6,16 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" />
@@ -56,14 +56,14 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" />
@@ -199,15 +199,15 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\blob.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\blob.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h" />
@@ -217,7 +217,7 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\row-indexes.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tokentype.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\row-indexes.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tokentype.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\metadata\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\metadata\Makefile.am" />
diff --git a/msvc/libmonoruntime-posix.targets b/msvc/libmonoruntime-posix.targets
index 9ea4f29f1f84da2f724861df24446a0d8748fa8f..ff2534889d4a11a6fee8ce1ec16519093d91134d 100644 (file)
--- a/msvc/libmonoruntime-posix.targets
+++ b/msvc/libmonoruntime-posix.targets
@@ -1,85 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-unix.c">
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-bsd.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-bsd.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-default.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-default.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/libmonoruntime-posix.targets.filters b/msvc/libmonoruntime-posix.targets.filters
index becf24e9c60d1c755b71ef95535f2a0638a79540..5718e6a0d220f58c942091999fca6aa6bf6d3871 100644 (file)
--- a/msvc/libmonoruntime-posix.targets.filters
+++ b/msvc/libmonoruntime-posix.targets.filters
@@ -45,7 +45,7 @@
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
-    </ClCompile>   
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\posix">
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\posix">
diff --git a/msvc/libmonoruntime-win32.targets.filters b/msvc/libmonoruntime-win32.targets.filters
index eab619cb689a61a2ab2a16afe50996c27c24f0e2..3b360da00e2c0c1b0e77a613908ad2be812b7a3f 100644 (file)
--- a/msvc/libmonoruntime-win32.targets.filters
+++ b/msvc/libmonoruntime-win32.targets.filters
@@ -48,7 +48,7 @@
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>    
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
diff --git a/msvc/libmonoutils-arch.targets b/msvc/libmonoutils-arch.targets
index 2790d649a0ae879ffe417ec3ec125f3ba13f42da..041daa7863d0fe4e22ee5002d7ddb9aab9720680 100644 (file)
--- a/msvc/libmonoutils-arch.targets
+++ b/msvc/libmonoutils-arch.targets
@@ -1,110 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+    <ExcludeFromWindows32Build>false</ExcludeFromWindows32Build>
+    <ExcludeFromWindows64Build>false</ExcludeFromWindows64Build>
+    <ExcludeFromWindows32Build Condition="'$(Platform)'=='Win32'">true</ExcludeFromWindows32Build>
+    <ExcludeFromWindows64Build Condition="'$(Platform)'=='x64'">true</ExcludeFromWindows64Build>
+  </PropertyGroup>
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
   <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c" />
   </ItemGroup>
   <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c" />
   </ItemGroup>
   <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
       <FileType>Document</FileType>
     </ClCompile>
     <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
       <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindows32Build)</ExcludedFromBuild>
       <PreprocessorDefinitions>X64</PreprocessorDefinitions>
     </MASM>
   </ItemGroup>
   <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c">
       <PreprocessorDefinitions>X64</PreprocessorDefinitions>
     </MASM>
   </ItemGroup>
   <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm64.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_arm64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_mips_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-mips.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_mips_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-mips.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_ppc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-ppc.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_ppc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-ppc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_sparc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-sparc.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_sparc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-sparc.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_s390x_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-os390x.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_s390x_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-os390x.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_wasm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-wasm.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_wasm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_unknown_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-unknown.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_unknown_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-unknown.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_cross_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
     </ClCompile>
   </ItemGroup>
   <ItemGroup Label="arch_cross_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ImportGroup Label="ExtensionSettings">
     </ClCompile>
   </ItemGroup>
   <ImportGroup Label="ExtensionSettings">
diff --git a/msvc/libmonoutils-arch.targets.filters b/msvc/libmonoutils-arch.targets.filters
index 261fc2f662e2c049ce3f5c9990d42bf59711c6eb..836b30fb65d3312abf07fa0fff6d97689c41e1ee 100644 (file)
--- a/msvc/libmonoutils-arch.targets.filters
+++ b/msvc/libmonoutils-arch.targets.filters
@@ -65,7 +65,7 @@
   <ItemGroup Label="arch_cross_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\cross</Filter>
   <ItemGroup Label="arch_cross_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\cross</Filter>
-    </ClCompile>    
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\arch">
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\arch">
diff --git a/msvc/libmonoutils-common.targets b/msvc/libmonoutils-common.targets
index f68262ab176e954c98e6e6ac8cdde4978789189c..d9da64597f1c95206fd08a6a9d145d40765b61a2 100644 (file)
--- a/msvc/libmonoutils-common.targets
+++ b/msvc/libmonoutils-common.targets
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="monoutils_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" />
   <ItemGroup Label="monoutils_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" />
@@ -14,44 +17,26 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-darwin.c">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-darwin.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-posix.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-posix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-wasm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.c">
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-android.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-android.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h" />
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h" />
@@ -132,71 +117,38 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach-helper.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach-helper.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-linux.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-linux.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-netbsd.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-netbsd.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-openbsd.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-openbsd.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-haiku.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-haiku.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-wasm.c">
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-wasm.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h" />
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h" />
@@ -212,7 +164,7 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" />        
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h" />
@@ -238,14 +190,14 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" />  
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" />
   </ItemGroup>
   <ItemGroup Label="libmonoutilsinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h" />
   </ItemGroup>
   <ItemGroup Label="libmonoutilsinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" />
diff --git a/msvc/libmonoutils-posix.targets b/msvc/libmonoutils-posix.targets
index c0d070e8fa8e96b9bfd16aabad5da06215103708..16da38196feb96c63c7d8d353e02fd75666e5b47 100644 (file)
--- a/msvc/libmonoutils-posix.targets
+++ b/msvc/libmonoutils-posix.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ExcludeFromWindowsBuild>true</ExcludeFromWindowsBuild>
+  </PropertyGroup>
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-unix.c">
   <ItemGroup Label="posix_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-unix.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
 </Project>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/msvc/monoposixhelper.targets b/msvc/monoposixhelper.targets
index 4a00ec1f34444056283cbebe1f99e7bfc6483ed3..6d5d9c1fa02efabcdbec1882d524b958bccbab2d 100644 (file)
--- a/msvc/monoposixhelper.targets
+++ b/msvc/monoposixhelper.targets
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
   <ItemGroup>
     <ClCompile Include="$(MonoSourceLocation)\support\adler32.c" />
     <ClCompile Include="$(MonoSourceLocation)\support\compress.c" />
   <ItemGroup>
     <ClCompile Include="$(MonoSourceLocation)\support\adler32.c" />
     <ClCompile Include="$(MonoSourceLocation)\support\compress.c" />
my mono mirror. check out Moved to http://github.com/mono/mono