[xbuild] Vbc task - make error column check a little non-specific.

[mono.git] / msvc / libtest.vcproj

diff --git a/msvc/libtest.vcproj b/msvc/libtest.vcproj
index 3a2b4289bdb74f655013ca4059e3ef4afb5b33a0..5f7e488cce162dc664eb54f349fe9b427ac1e938 100644 (file)
--- a/msvc/libtest.vcproj
+++ b/msvc/libtest.vcproj
@@ -44,7 +44,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&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;"\r
+                               AdditionalIncludeDirectories="&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;;..\"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -99,12 +99,11 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -120,13 +119,16 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               AdditionalIncludeDirectories="&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;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&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;;..\"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -145,16 +147,12 @@
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
                                AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gmodule-2.0.lib Psapi.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -179,11 +177,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug_eglib|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -202,16 +201,14 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               Optimization="1"\r
+                               AdditionalIncludeDirectories="&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;;..\"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -225,11 +222,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
-                               AdditionalDependencies="eglib.lib Psapi.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
+                               AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gmodule-2.0.lib Psapi.lib"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
@@ -258,7 +257,7 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release_eglib|Win32"\r
+                       Name="Release|x64"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
@@ -279,11 +278,12 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="&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;;..\"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -303,17 +303,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
-                               AdditionalDependencies="eglib.lib Psapi.lib"\r
+                               AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gmodule-2.0.lib Psapi.lib"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -338,7 +336,7 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Debug_eglib|Win32"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
@@ -358,12 +356,11 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&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;"\r
+                               AdditionalIncludeDirectories="..\eglib\src;..\"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -371,7 +368,7 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -385,13 +382,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
-                               AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gmodule-2.0.lib Psapi.lib"\r
+                               AdditionalDependencies="eglib.lib Psapi.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -411,20 +410,16 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
+                       Name="Debug_eglib|x64"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -444,10 +439,12 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               AdditionalIncludeDirectories="&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;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
-                               RuntimeLibrary="2"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\eglib\src;..\"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -465,13 +462,11 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
-                               AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gmodule-2.0.lib Psapi.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;;&quot;$(MONO_DEPENDENCIES_PREFIX)\lib&quot;"\r
+                               AdditionalDependencies="eglib.lib Psapi.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
                                TargetMachine="17"\r
                        />\r
@@ -493,19 +488,17 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug_eglib|x64"\r
+                       Name="Release_eglib|Win32"\r
                        OutputDirectory="$(PlatformName)_$(ConfigurationName)/bin"\r
                        IntermediateDirectory="$(PlatformName)_$(ConfigurationName)/obj/$(ProjectName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -521,16 +514,13 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               Optimization="1"\r
+                               AdditionalIncludeDirectories="..\eglib\src;..\"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -549,12 +539,16 @@
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\r
                                AdditionalDependencies="eglib.lib Psapi.lib"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(PlatformName)_$(ConfigurationName)/lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
                                ImportLibrary="$(PlatformName)_$(ConfigurationName)/lib/$(TargetName).lib"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -574,9 +568,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -608,7 +599,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\eglib\src"\r
+                               AdditionalIncludeDirectories="..\eglib\src;..\"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -656,9 +647,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r