projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #1857 from slluis/fix-assembly-resolver
[mono.git] / msvc / libmonoutils.vcxproj
diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index b52f26a5525e99b9752144b1e05e7475050328f3..52e3dc4bc47fa8e341b87e8c279c8dfa56b647af 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -22,6 +22,7 @@
   <ItemGroup>\r
     <ClCompile Include="..\mono\utils\dlmalloc.c" />\r
     <ClCompile Include="..\mono\utils\hazard-pointer.c" />\r
+    <ClCompile Include="..\mono\utils\json.c" />\r
     <ClCompile Include="..\mono\utils\lock-free-alloc.c" />\r
     <ClCompile Include="..\mono\utils\lock-free-array-queue.c" />\r
     <ClCompile Include="..\mono\utils\lock-free-queue.c" />\r
@@ -30,8 +31,10 @@
     <ClCompile Include="..\mono\utils\mach-support-x86.c" />\r
     <ClCompile Include="..\mono\utils\mach-support.c" />\r
     <ClCompile Include="..\mono\utils\mono-codeman.c" />\r
+    <ClCompile Include="..\mono\utils\mono-conc-hashtable.c" />\r
     <ClCompile Include="..\mono\utils\mono-context.c" />\r
     <ClCompile Include="..\mono\utils\mono-counters.c" />\r
+    <ClCompile Include="..\mono\utils\mono-dl-windows.c" />\r
     <ClCompile Include="..\mono\utils\mono-dl.c" />\r
     <ClCompile Include="..\mono\utils\mono-error.c" />\r
     <ClCompile Include="..\mono\utils\mono-filemap.c" />\r
@@ -44,6 +47,12 @@
     <ClCompile Include="..\mono\utils\mono-mmap.c" />\r
     <ClCompile Include="..\mono\utils\mono-mutex.c" />\r
     <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />\r
+    <ClCompile Include="..\mono\utils\mono-rand.c" />\r
+    <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />\r
+    <ClCompile Include="..\mono\utils\networking.c" />\r
+    <ClCompile Include="..\mono\utils\networking-posix.c" />\r
+    <ClCompile Include="..\mono\utils\networking-missing.c" />\r
+    <ClCompile Include="..\mono\utils\networking-windows.c" />\r
     <ClCompile Include="..\mono\utils\mono-path.c" />\r
     <ClCompile Include="..\mono\utils\mono-poll.c" />\r
     <ClCompile Include="..\mono\utils\mono-proclib.c" />\r
@@ -62,11 +71,12 @@
     <ClCompile Include="..\mono\utils\mono-value-hash.c" />\r
     <ClCompile Include="..\mono\utils\monobitset.c" />\r
     <ClCompile Include="..\mono\utils\strenc.c" />\r
-    <ClCompile Include="..\mono\utils\strtod.c" />\r
     <ClCompile Include="..\mono\utils\atomic.c" />\r
     <ClCompile Include="..\mono\utils\mono-hwcap.c" />\r
     <ClCompile Include="..\mono\utils\mono-hwcap-x86.c" />\r
     <ClCompile Include="..\mono\utils\bsearch.c" />\r
+    <ClCompile Include="..\mono\utils\memfuncs.c" />\r
+    <ClCompile Include="..\mono\utils\parse.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\mono\utils\dlmalloc.h" />\r
@@ -77,6 +87,7 @@
     <ClInclude Include="..\mono\utils\freebsd-elf_common.h" />\r
     <ClInclude Include="..\mono\utils\gc_wrapper.h" />\r
     <ClInclude Include="..\mono\utils\hazard-pointer.h" />\r
+    <ClInclude Include="..\mono\utils\json.h" />\r
     <ClInclude Include="..\mono\utils\linux_magic.h" />\r
     <ClInclude Include="..\mono\utils\lock-free-alloc.h" />\r
     <ClInclude Include="..\mono\utils\lock-free-array-queue.h" />\r
@@ -85,6 +96,8 @@
     <ClInclude Include="..\mono\utils\memcheck.h" />\r
     <ClInclude Include="..\mono\utils\mono-codeman.h" />\r
     <ClInclude Include="..\mono\utils\mono-compiler.h" />\r
+    <ClInclude Include="..\mono\utils\mono-complex.h" />\r
+    <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />\r
     <ClInclude Include="..\mono\utils\mono-context.h" />\r
     <ClInclude Include="..\mono\utils\mono-counters.h" />\r
     <ClInclude Include="..\mono\utils\mono-digest.h" />\r
@@ -109,6 +122,7 @@
     <ClInclude Include="..\mono\utils\mono-proclib.h" />\r
     <ClInclude Include="..\mono\utils\mono-property-hash.h" />\r
     <ClInclude Include="..\mono\utils\mono-publib.h" />\r
+    <ClInclude Include="..\mono\utils\mono-rand.h" />\r
     <ClInclude Include="..\mono\utils\mono-semaphore.h" />\r
     <ClInclude Include="..\mono\utils\mono-sigcontext.h" />\r
     <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />\r
@@ -121,12 +135,18 @@
     <ClInclude Include="..\mono\utils\mono-value-hash.h" />\r
     <ClInclude Include="..\mono\utils\monobitset.h" />\r
     <ClInclude Include="..\mono\utils\strenc.h" />\r
-    <ClInclude Include="..\mono\utils\strtod.h" />\r
     <ClInclude Include="..\mono\utils\valgrind.h" />\r
     <ClInclude Include="..\mono\utils\atomic.h" />\r
     <ClInclude Include="..\mono\utils\mono-hwcap.h" />\r
     <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />\r
     <ClInclude Include="..\mono\utils\bsearch.h" />\r
+    <ClInclude Include="..\mono\utils\memfuncs.h" />\r
+    <ClInclude Include="..\mono\utils\parse.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <MASM Include="..\mono\utils\win64.asm">\r
+      <FileType>Document</FileType>\r
+    </MASM>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}</ProjectGuid>\r
@@ -138,28 +158,29 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
+    <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
+    <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
+    <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
+    <PlatformToolset>v120</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />\r
   </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
@@ -214,7 +235,7 @@
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>$(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(top_srcdir);$(top_srcdir)/eglib/src;$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -223,6 +244,9 @@
     <PreBuildEvent>\r
       <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
+    <MASM>\r
+      <PreprocessorDefinitions>X64</PreprocessorDefinitions>\r
+    </MASM>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
@@ -265,8 +289,12 @@
     <PreBuildEvent>\r
       <Command>winsetup.bat</Command>\r
     </PreBuildEvent>\r
+    <MASM>\r
+      <PreprocessorDefinitions>X64</PreprocessorDefinitions>\r
+    </MASM>\r
   </ItemDefinitionGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />\r
   </ImportGroup>\r
 </Project>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono