X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Flibmono.vcproj;h=3e9034e0cd1b09cb701782d3ba217f7c5fcaf443;hb=fc63af5a71ea74b98476c10da43ba0931e947f02;hp=a205234078da2754ee053e32ad3e61bc8b17b3b6;hpb=0b1817b6f7543684aac0cd13a40e8ec6cbb18003;p=mono.git

diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index a205234078d..3e9034e0cd1 100644
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -19,8 +19,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\bin\$(PlatformName)"
-			IntermediateDirectory=".\obj\$(ProjectName)\$(PlatformName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -45,11 +45,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D /NODEFAULTLIB:LIBCD&quot; &quot;"
-				Optimization="2"
+				Optimization="1"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;__i386__;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -70,11 +70,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;;&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"
 				ModuleDefinitionFile="mono.def"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -103,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\bin\$(PlatformName)"
-			IntermediateDirectory=".\obj\$(ProjectName)\$(PlatformName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -130,11 +131,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D /NODEFAULTLIB:LIBCD&quot; &quot;"
-				Optimization="2"
+				Optimization="1"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -155,11 +156,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;;&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"
 				ModuleDefinitionFile="mono.def"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -189,8 +191,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\bin\$(PlatformName)"
-			IntermediateDirectory=".\obj\$(ProjectName)\$(PlatformName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -219,7 +221,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;__i386__;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -243,12 +245,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;;&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -277,8 +280,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\bin\$(PlatformName)"
-			IntermediateDirectory=".\obj\$(ProjectName)\$(PlatformName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -308,7 +311,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
-				PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE;__x86_64__"
+				PreprocessorDefinitions="_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -332,12 +335,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				LinkLibraryDependencies="false"
 				AdditionalDependencies="version.lib libgc.lib glib-2.0.lib ws2_32.lib gthread-2.0.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;;&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -367,8 +371,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_eglib|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -397,7 +401,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;__i386__;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -421,12 +425,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -455,8 +460,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_eglib|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -486,7 +491,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"
-				PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE;__x86_64__"
+				PreprocessorDefinitions="_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -510,12 +515,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"
 				ModuleDefinitionFile="mono.def"
 				GenerateDebugInformation="true"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ProgramDatabaseFile="$(TargetDir)libmono.pdb"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -545,8 +552,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release_eglib|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -571,11 +578,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D /NODEFAULTLIB:LIBCD&quot; &quot;"
-				Optimization="2"
+				Optimization="1"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;__i386__;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -596,11 +603,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"
 				ModuleDefinitionFile="mono.def"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -629,8 +637,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release_eglib|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"
+			IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -656,11 +664,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D /NODEFAULTLIB:LIBCD&quot; &quot;"
-				Optimization="2"
+				Optimization="1"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -681,11 +689,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"
 				OutputFile="$(OutDir)\mono.dll"
-				AdditionalLibraryDirectories="&quot;.\lib\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"
 				ModuleDefinitionFile="mono.def"
-				ImportLibrary=".\lib\$(PlatformName)\$(TargetName).lib"
+				ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -733,6 +742,14 @@
 		<Filter
 			Name="utils"
 			>
+			<File
+				RelativePath="..\mono\utils\dlmalloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\utils\dlmalloc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\utils\mono-codeman.c"
 				>
@@ -1017,6 +1034,10 @@
 				RelativePath="..\mono\utils\mono-dl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\utils\mono-filemap.c"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\utils\mono-hash.c"
 				>
@@ -1509,6 +1530,106 @@
 				RelativePath="..\mono\utils\mono-poll.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\utils\mono-proclib.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_eglib|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_eglib|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_eglib|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_eglib|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\mono\utils\mono-proclib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\utils\mono-property-hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\utils\mono-property-hash.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\utils\mono-sha1.c"
 				>
@@ -1705,6 +1826,14 @@
 				RelativePath="..\mono\utils\mono-uri.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\utils\mono-value-hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\utils\mono-value-hash.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\utils\monobitset.c"
 				>
@@ -2165,6 +2294,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\mono\metadata\attach.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\metadata\attach.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\metadata\boehm-gc.c"
 				>
@@ -2269,6 +2406,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\mono\metadata\cominterop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\metadata\cominterop.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\metadata\console-io.c"
 				>
@@ -2277,6 +2422,14 @@
 				RelativePath="..\mono\metadata\console-io.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\metadata\coree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\metadata\coree.h"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\metadata\culture-info-tables.h"
 				>
@@ -4777,94 +4930,6 @@
 				RelativePath="..\mono\metadata\rand.h"
 				>
 			</File>
-			<File
-				RelativePath="..\mono\metadata\rawbuffer.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_eglib|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_eglib|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_eglib|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_eglib|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\mono\metadata\reflection.c"
 				>
@@ -5717,10 +5782,6 @@
 				RelativePath="..\mono\mini\abcremoval.h"
 				>
 			</File>
-			<File
-				RelativePath="..\mono\mini\aliasing.c"
-				>
-			</File>
 			<File
 				RelativePath="..\mono\mini\aot-compiler.c"
 				>
@@ -6089,6 +6150,10 @@
 				RelativePath="..\mono\mini\declsec.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\mini\decompose.c"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\mini\dominators.c"
 				>
@@ -6266,92 +6331,12 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\generic-sharing.c"
+				RelativePath="..\mono\mini\dwarfwriter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\dwarfwriter.h"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_eglib|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug_eglib|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_eglib|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release_eglib|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\mono\mini\graph.c"
@@ -6530,7 +6515,19 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\inssel.c"
+				RelativePath="..\mono\mini\image-writer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\image-writer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\ir-emit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\jit-icalls.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -6618,11 +6615,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\inssel.h"
+				RelativePath="..\mono\mini\jit-icalls.h"
 				>
 			</File>
 			<File
-				RelativePath="..\mono\mini\jit-icalls.c"
+				RelativePath="..\mono\mini\linear-scan.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -6710,11 +6707,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\jit-icalls.h"
-				>
-			</File>
-			<File
-				RelativePath="..\mono\mini\linear-scan.c"
+				RelativePath="..\mono\mini\liveness.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -6802,7 +6795,23 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\liveness.c"
+				RelativePath="..\mono\mini\local-propagation.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\method-to-ir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\mini-arch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\mini-codegen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\mini-exceptions.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -6890,19 +6899,15 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\mono\mini\local-propagation.c"
-				>
-			</File>
-			<File
-				RelativePath="..\mono\mini\mini-arch.h"
+				RelativePath="..\mono\mini\mini-gc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\mono\mini\mini-codegen.c"
+				RelativePath="..\mono\mini\mini-gc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\mono\mini\mini-exceptions.c"
+				RelativePath="..\mono\mini\mini-generic-sharing.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -6997,6 +7002,10 @@
 				RelativePath="..\mono\mini\mini-trampolines.c"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\mini\mini-windows.c"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\mini\mini.c"
 				>
@@ -7181,6 +7190,14 @@
 				RelativePath="..\mono\mini\regalloc.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\mini\regalloc2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\mono\mini\simd-intrinsics.c"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\mini\ssa.c"
 				>
@@ -7269,14 +7286,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\mono\mini\ssapre-cee-ops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\mono\mini\ssapre-mini-ops.h"
-				>
-			</File>
 			<File
 				RelativePath="..\mono\mini\ssapre.c"
 				>
@@ -7377,6 +7386,10 @@
 				RelativePath="..\mono\mini\trace.h"
 				>
 			</File>
+			<File
+				RelativePath="..\mono\mini\unwind.c"
+				>
+			</File>
 			<File
 				RelativePath="..\mono\mini\wapihandles.c"
 				>