Add missing source file, sgen-os-coop.c, to libmonoruntime Visual Studio project.

Add missing source file, sgen-os-coop.c to project.

Add source files and headers into correct filters (Header/Source Files).

Eliminated Visual Studio linker warning LNK4221 for libmonoruntime project generated
by empty source files under certain configurations, boehm-gc.c, lock-tracer.c,
null-gc.c and sgen-os-coop.c

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index 469bfdb57d59b2cb1fe2610c18111cfae3183368..846e34757b04076f355b7369a47b7ffcf274a34d 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -1916,5 +1916,9 @@ mono_gchandle_free_domain (MonoDomain *domain)
        }
 
 }
-
+#else
+       #ifdef _MSC_VER
+               // Quiet Visual Studio linker warning, LNK4221, in cases when this source file intentional ends up empty.
+               void __mono_win32_boehm_gc_quiet_lnk4221(void) {}
+       #endif
 #endif /* no Boehm GC */

diff --git a/mono/metadata/lock-tracer.c b/mono/metadata/lock-tracer.c
index f0d2bca6ed49d12a513f5356d770a9790b2e53f3..66f7d6b560d084cac2f07ffc20249e62b699c8f9 100644 (file)
--- a/mono/metadata/lock-tracer.c
+++ b/mono/metadata/lock-tracer.c
@@ -24,7 +24,6 @@
 
 #include "lock-tracer.h"
 
-
 /*
  * This is a very simple lock trace implementation. It can be used to verify that the runtime is
  * correctly following all locking rules.
@@ -141,5 +140,9 @@ mono_locks_lock_released (RuntimeLocks kind, gpointer lock)
 {
        add_record (RECORD_LOCK_RELEASED, kind, lock);
 }
-
-#endif
+#else
+       #ifdef _MSC_VER
+               // Quiet Visual Studio linker warning, LNK4221, in cases when this source file intentional ends up empty.
+               void __mono_win32_lock_tracer_quiet_lnk4221(void) {}
+       #endif
+#endif /* LOCK_TRACER */

diff --git a/mono/metadata/null-gc.c b/mono/metadata/null-gc.c
index c1a531c0dc87eac782c46785a481b82df532abc6..47d7dc5b1decdcde5b5cec33b24527f639ddc41d 100644 (file)
--- a/mono/metadata/null-gc.c
+++ b/mono/metadata/null-gc.c
@@ -551,5 +551,9 @@ mono_gc_is_null (void)
 {
        return TRUE;
 }
-
-#endif
+#else
+       #ifdef _MSC_VER
+               // Quiet Visual Studio linker warning, LNK4221, in cases when this source file intentional ends up empty.
+               void __mono_win32_null_gc_quiet_lnk4221(void) {}
+       #endif
+#endif /* HAVE_NULL_GC */

diff --git a/mono/metadata/sgen-os-coop.c b/mono/metadata/sgen-os-coop.c
index 90c8266b341f7749da66d0ae7d3fab1a6ebbffcc..32bab7ebcb8655cc6adf94c918beb880ce7a8a72 100644 (file)
--- a/mono/metadata/sgen-os-coop.c
+++ b/mono/metadata/sgen-os-coop.c
@@ -9,6 +9,7 @@
  */
 
 #include "config.h"
+
 #ifdef HAVE_SGEN_GC
 
 
@@ -65,6 +66,10 @@ mono_gc_get_restart_signal (void)
 {
        return -1;
 }
-
-#endif
+#else
+       #ifdef _MSC_VER
+               // Quiet Visual Studio linker warning, LNK4221, in cases when this source file intentional ends up empty.
+               void __mono_win32_sgen_os_coop_quiet_lnk4221(void) {}
+       #endif
+#endif /* USE_COOP_GC */
 #endif

diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj
index 0c9876be062ce5de5d66c6f383466cf82da6572a..41f6439154b8065c50523f175f48f0c55c97835b 100644 (file)
--- a/msvc/libmonoruntime.vcxproj
+++ b/msvc/libmonoruntime.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -80,6 +80,7 @@
     <ClCompile Include="..\mono\metadata\mono-security.c" />\r
     <ClCompile Include="..\mono\metadata\seq-points-data.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-mono.c" />\r
+    <ClCompile Include="..\mono\metadata\sgen-os-coop.c" />\r
     <ClCompile Include="..\mono\metadata\threadpool-ms-io.c" />\r
     <ClCompile Include="..\mono\metadata\threadpool-ms.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-bridge.c" />\r
@@ -347,4 +348,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/msvc/libmonoruntime.vcxproj.filters b/msvc/libmonoruntime.vcxproj.filters
index e7d4b4110f5afa7abcbf9ed4fa9876ae1a803193..13f50fb2be4cdd5171a246f051f07b3b60db1da9 100644 (file)
--- a/msvc/libmonoruntime.vcxproj.filters
+++ b/msvc/libmonoruntime.vcxproj.filters
@@ -223,6 +223,27 @@
     <ClCompile Include="..\mono\metadata\metadata-cross-helpers.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\custom-attrs.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\dynamic-image.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\dynamic-stream.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\sre.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\sre-encode.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\sre-save.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\mono\metadata\sgen-os-coop.c">\r
+      <Filter>Source Files\sgen</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\mono\metadata\appdomain.h">\r
@@ -453,6 +474,24 @@
     <ClInclude Include="..\mono\metadata\gc-internals.h">\r
       <Filter>Header Files\gc</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\custom-attrs-internals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\dynamic-image-internals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\dynamic-stream-internals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\reflection-cache.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\reflection-internals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\sre-internals.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Filter Include="Header Files">\r