X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Flibmonoutils.vcxproj;h=5daad9472621c95d4b94c98809d6f0ab2a74ff50;hb=797c536463feb7ebf7b3aafdee518404389b726e;hp=a091267ea896a81a1d73d318bf8f266ea67ad41f;hpb=bccf5cf12174ed9b716fd20717d3ffe0b2e4c6a0;p=mono.git

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index a091267ea89..5daad947262 100644
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -22,6 +22,7 @@
   <ItemGroup>
     <ClCompile Include="..\mono\utils\dlmalloc.c" />
     <ClCompile Include="..\mono\utils\hazard-pointer.c" />
+    <ClCompile Include="..\mono\utils\json.c" />
     <ClCompile Include="..\mono\utils\lock-free-alloc.c" />
     <ClCompile Include="..\mono\utils\lock-free-array-queue.c" />
     <ClCompile Include="..\mono\utils\lock-free-queue.c" />
@@ -44,8 +45,9 @@
     <ClCompile Include="..\mono\utils\mono-math.c" />
     <ClCompile Include="..\mono\utils\mono-md5.c" />
     <ClCompile Include="..\mono\utils\mono-mmap.c" />
-    <ClCompile Include="..\mono\utils\mono-mutex.c" />
     <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />
+    <ClCompile Include="..\mono\utils\mono-rand.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />
     <ClCompile Include="..\mono\utils\networking.c" />
     <ClCompile Include="..\mono\utils\networking-posix.c" />
     <ClCompile Include="..\mono\utils\networking-missing.c" />
@@ -55,25 +57,29 @@
     <ClCompile Include="..\mono\utils\mono-proclib.c" />
     <ClCompile Include="..\mono\utils\mono-property-hash.c" />
     <ClCompile Include="..\mono\utils\mono-publib.c" />
-    <ClCompile Include="..\mono\utils\mono-semaphore.c" />
     <ClCompile Include="..\mono\utils\mono-sha1.c" />
     <ClCompile Include="..\mono\utils\mono-stdlib.c" />
     <ClCompile Include="..\mono\utils\mono-threads-mach.c" />
     <ClCompile Include="..\mono\utils\mono-threads-posix.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c" />
     <ClCompile Include="..\mono\utils\mono-threads-windows.c" />
     <ClCompile Include="..\mono\utils\mono-threads.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-coop.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-posix-abort-syscall.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-mach-abort-syscall.c" />
+    <ClCompile Include="..\mono\utils\mono-threads-windows-abort-syscall.c" />
     <ClCompile Include="..\mono\utils\mono-time.c" />
     <ClCompile Include="..\mono\utils\mono-tls.c" />
     <ClCompile Include="..\mono\utils\mono-uri.c" />
     <ClCompile Include="..\mono\utils\mono-value-hash.c" />
     <ClCompile Include="..\mono\utils\monobitset.c" />
     <ClCompile Include="..\mono\utils\strenc.c" />
-    <ClCompile Include="..\mono\utils\strtod.c" />
     <ClCompile Include="..\mono\utils\atomic.c" />
     <ClCompile Include="..\mono\utils\mono-hwcap.c" />
     <ClCompile Include="..\mono\utils\mono-hwcap-x86.c" />
     <ClCompile Include="..\mono\utils\bsearch.c" />
-    <ClInclude Include="..\mono\utils\json.c" />    
+    <ClCompile Include="..\mono\utils\memfuncs.c" />
+    <ClCompile Include="..\mono\utils\parse.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\mono\utils\dlmalloc.h" />
@@ -84,6 +90,7 @@
     <ClInclude Include="..\mono\utils\freebsd-elf_common.h" />
     <ClInclude Include="..\mono\utils\gc_wrapper.h" />
     <ClInclude Include="..\mono\utils\hazard-pointer.h" />
+    <ClInclude Include="..\mono\utils\json.h" />
     <ClInclude Include="..\mono\utils\linux_magic.h" />
     <ClInclude Include="..\mono\utils\lock-free-alloc.h" />
     <ClInclude Include="..\mono\utils\lock-free-array-queue.h" />
@@ -92,8 +99,11 @@
     <ClInclude Include="..\mono\utils\memcheck.h" />
     <ClInclude Include="..\mono\utils\mono-codeman.h" />
     <ClInclude Include="..\mono\utils\mono-compiler.h" />
+    <ClInclude Include="..\mono\utils\mono-complex.h" />
     <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />
     <ClInclude Include="..\mono\utils\mono-context.h" />
+    <ClInclude Include="..\mono\utils\mono-coop-mutex.h" />
+    <ClInclude Include="..\mono\utils\mono-coop-semaphore.h" />
     <ClInclude Include="..\mono\utils\mono-counters.h" />
     <ClInclude Include="..\mono\utils\mono-digest.h" />
     <ClInclude Include="..\mono\utils\mono-dl-fallback.h" />
@@ -103,39 +113,44 @@
     <ClInclude Include="..\mono\utils\mono-internal-hash.h" />
     <ClInclude Include="..\mono\utils\mono-io-portability.h" />
     <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />
-    <ClInclude Include="..\mono\utils\mono-logger-internal.h" />
+    <ClInclude Include="..\mono\utils\mono-logger-internals.h" />
     <ClInclude Include="..\mono\utils\mono-logger.h" />
     <ClInclude Include="..\mono\utils\mono-machine.h" />
     <ClInclude Include="..\mono\utils\mono-math.h" />
     <ClInclude Include="..\mono\utils\mono-membar.h" />
     <ClInclude Include="..\mono\utils\mono-memory-model.h" />
     <ClInclude Include="..\mono\utils\mono-mmap.h" />
-    <ClInclude Include="..\mono\utils\mono-mutex.h" />
     <ClInclude Include="..\mono\utils\mono-networkinterfaces.h" />
+    <ClInclude Include="..\mono\utils\mono-once.h" />
+    <ClInclude Include="..\mono\utils\mono-os-mutex.h" />
+    <ClInclude Include="..\mono\utils\mono-os-semaphore.h" />
     <ClInclude Include="..\mono\utils\mono-path.h" />
     <ClInclude Include="..\mono\utils\mono-poll.h" />
     <ClInclude Include="..\mono\utils\mono-proclib.h" />
     <ClInclude Include="..\mono\utils\mono-property-hash.h" />
     <ClInclude Include="..\mono\utils\mono-publib.h" />
-    <ClInclude Include="..\mono\utils\mono-semaphore.h" />
+    <ClInclude Include="..\mono\utils\mono-rand.h" />
     <ClInclude Include="..\mono\utils\mono-sigcontext.h" />
     <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />
     <ClInclude Include="..\mono\utils\mono-stdlib.h" />
     <ClInclude Include="..\mono\utils\mono-string.h" />
     <ClInclude Include="..\mono\utils\mono-threads.h" />
+    <ClInclude Include="..\mono\utils\mono-threads-api.h" />
+    <ClInclude Include="..\mono\utils\mono-threads-coop.h" />
+    <ClInclude Include="..\mono\utils\mono-threads-posix-signals.h" />
     <ClInclude Include="..\mono\utils\mono-time.h" />
     <ClInclude Include="..\mono\utils\mono-tls.h" />
     <ClInclude Include="..\mono\utils\mono-uri.h" />
     <ClInclude Include="..\mono\utils\mono-value-hash.h" />
     <ClInclude Include="..\mono\utils\monobitset.h" />
     <ClInclude Include="..\mono\utils\strenc.h" />
-    <ClInclude Include="..\mono\utils\strtod.h" />
     <ClInclude Include="..\mono\utils\valgrind.h" />
     <ClInclude Include="..\mono\utils\atomic.h" />
     <ClInclude Include="..\mono\utils\mono-hwcap.h" />
     <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
     <ClInclude Include="..\mono\utils\bsearch.h" />
-    <ClInclude Include="..\mono\utils\json.h" />
+    <ClInclude Include="..\mono\utils\memfuncs.h" />
+    <ClInclude Include="..\mono\utils\parse.h" />
   </ItemGroup>
   <ItemGroup>
     <MASM Include="..\mono\utils\win64.asm">
@@ -174,7 +189,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+    <Import Project=".\masm.fixed.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -190,19 +205,19 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\lib\</OutDir>
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\lib\</OutDir>
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Platform)\lib\</OutDir>
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\lib\</OutDir>
+    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -291,4 +306,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>