2009-04-21 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / msvc / libmono.vcproj

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