[xbuild] Fix bug #671700, resource naming in presence of "Link".

[mono.git] / msvc / libmono.vcproj

diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index a756c73914915827a37c0694e8810691afb3746d..4a565367c41b570251e4be905ab63bd0c578b8c2 100644 (file)
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -50,7 +50,7 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";..\mono\;..\mono\jit"\r
-                               PreprocessorDefinitions="NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -135,7 +135,7 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";..\mono\;..\mono\jit"\r
-                               PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -218,7 +218,7 @@
                                InlineFunctionExpansion="0"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";..\mono\;..\mono\jit"\r
-                               PreprocessorDefinitions="_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -307,7 +307,7 @@
                                InlineFunctionExpansion="0"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";..\mono\;..\mono\jit"\r
-                               PreprocessorDefinitions="_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -395,7 +395,7 @@
                                InlineFunctionExpansion="0"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="TARGET_X86;_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="TARGET_X86;_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -484,7 +484,7 @@
                                InlineFunctionExpansion="0"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -509,7 +509,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
-                               AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib"\r
+                               AdditionalDependencies="version.lib libgc.lib eglib.lib ws2_32.lib Psapi.lib winmm.lib mswsock.lib"\r
                                OutputFile="$(OutDir)\mono.dll"\r
                                AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                ModuleDefinitionFile="mono.def"\r
@@ -572,7 +572,7 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -657,7 +657,7 @@
                                InlineFunctionExpansion="1"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src"\r
-                               PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_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
+                               PreprocessorDefinitions="NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_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
@@ -1021,15 +1021,15 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\mono\utils\mono-error.c"\r
+                               RelativePath="..\mono\utils\mono-error-internals.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\mono\utils\mono-error.h"\r
+                               RelativePath="..\mono\utils\mono-error.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\mono\utils\mono-error-internals.h"\r
+                               RelativePath="..\mono\utils\mono-error.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1037,7 +1037,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\mono\utils\mono-hash.c"\r
+                               RelativePath="..\mono\metadata\mono-hash.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
@@ -1125,7 +1125,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\mono\utils\mono-hash.h"\r
+                               RelativePath="..\mono\metadata\mono-hash.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1636,6 +1636,18 @@
                                RelativePath="..\mono\utils\mono-property-hash.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-publib.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-semaphore.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\utils\mono-semaphore.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\mono-sha1.c"\r
                                >\r
@@ -1840,6 +1852,14 @@
                                RelativePath="..\mono\utils\mono-value-hash.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-wsq.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-wsq.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\monobitset.c"\r
                                >\r
@@ -1932,6 +1952,14 @@
                                RelativePath="..\mono\utils\monobitset.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\runtime.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\runtime.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\utils\strenc.c"\r
                                >\r
@@ -3268,114 +3296,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\mono\metadata\generic-sharing.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\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
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\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
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\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
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\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
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release_eglib|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               ObjectFile="$(IntDir)\$(InputName)1.obj"\r
-                                               XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
                        <File\r
                                RelativePath="..\mono\metadata\icall.c"\r
                                >\r
@@ -4108,6 +4028,14 @@
                                RelativePath="..\mono\metadata\monitor.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-basic-block.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\mono\metadata\mono-basic-block.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\mono\metadata\mono-config.c"\r
                                >\r
@@ -7412,6 +7340,10 @@
                                RelativePath="..\mono\mini\wapihandles.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mono\mini\xdebug.c"\r
+                               >\r
+                       </File>\r
                        <Filter\r
                                Name="x86"\r
                                >\r