Write family name last, as other entries in this file.

[oota-llvm.git] / win32 / Configure / Configure.vcproj

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 5c7062986ea822f6339667becfcedcd009eea93f..6e504b03b04af1a08025070a329b22c3881aaa75 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -23,7 +23,7 @@
                        OutputDirectory="$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -192,9 +192,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\Config\config.h"
-                                               CommandLine="copy &quot;$(InputPath)&quot;+&quot;$(SolutionDir)config.h&quot;  &quot;$(ProjectDir)..\llvm\Config\config.h&quot;&#x0D;&#x0A;"
-                                               AdditionalDependencies="&quot;$(SolutionDir)config.h&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\Config\config.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot;+&quot;$(ProjectDir)..\config.h&quot;  &quot;$(ProjectDir)..\llvm\Config\config.h&quot;&#x0D;&#x0A;"
+                                               AdditionalDependencies="&quot;$(ProjectDir)..\config.h&quot;"
                                                Outputs="&quot;$(ProjectDir)..\llvm\Config\config.h&quot;"
                                        />
                                </FileConfiguration>
@@ -203,9 +203,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\Config\config.h"
-                                               CommandLine="copy &quot;$(InputPath)&quot;+&quot;$(SolutionDir)config.h&quot;  &quot;$(ProjectDir)..\llvm\Config\config.h&quot;&#x0D;&#x0A;"
-                                               AdditionalDependencies="&quot;$(SolutionDir)config.h&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\Config\config.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot;+&quot;$(ProjectDir)..\config.h&quot;  &quot;$(ProjectDir)..\llvm\Config\config.h&quot;&#x0D;&#x0A;"
+                                               AdditionalDependencies="&quot;$(ProjectDir)..\config.h&quot;"
                                                Outputs="&quot;$(ProjectDir)..\llvm\Config\config.h&quot;"
                                        />
                                </FileConfiguration>
@@ -218,7 +218,7 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
+                                               Description="Generating $(ProjectDir)..\llvm\Support\DataTypes.h"
                                                CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;&#x0D;&#x0A;"
                                                Outputs="&quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;"
                                        />
@@ -228,23 +228,23 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
+                                               Description="Generating $(ProjectDir)..\llvm\Support\DataTypes.h"
                                                CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;&#x0D;&#x0A;"
                                                Outputs="&quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\Adt\hash_map.in"
+                               RelativePath="..\..\include\llvm\ADT\hash_map.h.in"
                                >
                                <FileConfiguration
                                        Name="Configure|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\hash_map.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
@@ -252,23 +252,23 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\hash_map.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\Adt\hash_set.in"
+                               RelativePath="..\..\include\llvm\ADT\hash_set.h.in"
                                >
                                <FileConfiguration
                                        Name="Configure|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\hash_set.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
@@ -276,23 +276,23 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\hash_set.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\include\llvm\Adt\iterator.in"
+                               RelativePath="..\..\include\llvm\ADT\iterator.h.in"
                                >
                                <FileConfiguration
                                        Name="Configure|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\iterator"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\iterator.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
@@ -300,9 +300,9 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating $(SolutionDir)llvm\ADT\iterator"
-                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator&quot;&#x0D;&#x0A;"
-                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator&quot;"
+                                               Description="Generating $(ProjectDir)..\llvm\ADT\iterator.h"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>