Merge pull request #2237 from xmcclure/container-owner

[mono.git] / msvc / libmonoruntime.vcxproj

diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj
index 84ed279abfc550bf76a7a46a09958757ed9d2074..f4be234ee2e1d035a49b4ca78acb097f950f650a 100644 (file)
--- a/msvc/libmonoruntime.vcxproj
+++ b/msvc/libmonoruntime.vcxproj
@@ -71,13 +71,11 @@
     <ClCompile Include="..\mono\metadata\mono-basic-block.c" />\r
     <ClCompile Include="..\mono\metadata\mono-config.c" />\r
     <ClCompile Include="..\mono\metadata\mono-config-dirs.c" />\r
-    <ClCompile Include="..\mono\metadata\mono-cq.c" />\r
     <ClCompile Include="..\mono\metadata\mono-debug.c" />\r
     <ClCompile Include="..\mono\metadata\mono-endian.c" />\r
     <ClCompile Include="..\mono\metadata\mono-hash.c" />\r
     <ClCompile Include="..\mono\metadata\mono-mlist.c" />\r
     <ClCompile Include="..\mono\metadata\mono-perfcounters.c" />\r
-    <ClCompile Include="..\mono\metadata\mono-wsq.c" />\r
     <ClCompile Include="..\mono\metadata\nacl-stub.c" />\r
     <ClCompile Include="..\mono\metadata\null-gc.c" />\r
     <ClCompile Include="..\mono\metadata\number-ms.c" />\r
@@ -101,6 +99,7 @@
     <ClCompile Include="..\mono\sgen\sgen-debug.c" />\r
     <ClCompile Include="..\mono\sgen\sgen-descriptor.c" />\r
     <ClCompile Include="..\mono\sgen\sgen-gc.c" />\r
+    <ClCompile Include="..\mono\sgen\sgen-gchandles.c" />\r
     <ClCompile Include="..\mono\sgen\sgen-gray.c" />\r
     <ClCompile Include="..\mono\sgen\sgen-hash-table.c" />\r
     <ClCompile Include="..\mono\sgen\sgen-internal.c" />\r
@@ -129,8 +128,6 @@
     <ClCompile Include="..\mono\metadata\socket-io.c" />\r
     <ClCompile Include="..\mono\metadata\string-icalls.c" />\r
     <ClCompile Include="..\mono\metadata\sysmath.c" />\r
-    <ClCompile Include="..\mono\metadata\threadpool.c" />\r
-    <ClCompile Include="..\mono\metadata\tpool-poll.c" />\r
     <ClCompile Include="..\mono\metadata\threads.c" />\r
     <ClCompile Include="..\mono\metadata\verify.c" />\r
     <ClCompile Include="..\mono\mini\mini-cross-helpers.c" />\r
@@ -157,7 +154,7 @@
     <ClInclude Include="..\mono\metadata\exception.h" />\r
     <ClInclude Include="..\mono\metadata\file-io.h" />\r
     <ClInclude Include="..\mono\metadata\filewatcher.h" />\r
-    <ClInclude Include="..\mono\metadata\gc-internal.h" />\r
+    <ClInclude Include="..\mono\metadata\gc-internals.h" />\r
     <ClInclude Include="..\mono\metadata\number-ms.h" />\r
     <ClInclude Include="..\mono\metadata\seq-points-data.h" />\r
     <ClInclude Include="..\mono\metadata\threadpool-ms-io.h" />\r
@@ -178,7 +175,6 @@
     <ClInclude Include="..\mono\metadata\mono-basic-block.h" />\r
     <ClInclude Include="..\mono\metadata\mono-config.h" />\r
     <ClInclude Include="..\mono\metadata\mono-config-dirs.h" />\r
-    <ClInclude Include="..\mono\metadata\mono-cq.h" />\r
     <ClInclude Include="..\mono\metadata\mono-debug-debugger.h" />\r
     <ClInclude Include="..\mono\metadata\mono-debug.h" />\r
     <ClInclude Include="..\mono\metadata\mono-endian.h" />\r
@@ -187,7 +183,6 @@
     <ClInclude Include="..\mono\metadata\mono-perfcounters-def.h" />\r
     <ClInclude Include="..\mono\metadata\mono-perfcounters.h" />\r
     <ClInclude Include="..\mono\metadata\mono-ptr-array.h" />\r
-    <ClInclude Include="..\mono\metadata\mono-wsq.h" />\r
     <ClInclude Include="..\mono\metadata\normalization-tables.h" />\r
     <ClInclude Include="..\mono\metadata\number-formatter.h" />\r
     <ClInclude Include="..\mono\metadata\object-internals.h" />\r
@@ -226,8 +221,6 @@
     <ClInclude Include="..\mono\metadata\string-icalls.h" />\r
     <ClInclude Include="..\mono\metadata\sysmath.h" />\r
     <ClInclude Include="..\mono\metadata\tabledefs.h" />\r
-    <ClInclude Include="..\mono\metadata\threadpool-internals.h" />\r
-    <ClInclude Include="..\mono\metadata\threadpool.h" />\r
     <ClInclude Include="..\mono\metadata\threads-types.h" />\r
     <ClInclude Include="..\mono\metadata\verify-internals.h" />\r
     <ClInclude Include="..\mono\metadata\verify.h" />\r
@@ -316,38 +309,38 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <TargetName>$(ProjectName)sgen</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <TargetName>$(ProjectName)sgen</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <TargetName>$(ProjectName)sgen</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">\r
-    <OutDir>$(Platform)\lib\</OutDir>\r
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
     <TargetName>$(ProjectName)sgen</TargetName>\r
   </PropertyGroup>\r
@@ -359,6 +352,7 @@
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -483,4 +477,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file