Updated VC++ build system

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44004 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index f4ec8f1eaf98afb7a9aa2aa7c80c498ecf1c28ee..6d58135fddae83097e9305ce68f53badfe74b9b8 100644 (file)
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -169,10 +169,6 @@
                                RelativePath="..\..\lib\CodeGen\BranchFolding.cpp"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\lib\CodeGen\BreakCriticalMachineEdges.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\CodeGen\CollectorMetadata.cpp"
                                >
@@ -367,6 +363,10 @@
                                RelativePath="..\..\include\llvm\CodeGen\AsmPrinter.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\include\llvm\CodeGen\BreakCriticalMachineEdge.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h"
                                >

diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 9a7bcd48ec57f2af8f5a78f8375babadc7335a63..ffe65cb28af9570bf99966f902df39353213eed0 100644 (file)
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -111,9 +111,9 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\Config\config.h"
-                                               CommandLine="copy $(InputPath)+$(SolutionDir)config.h  $(ProjectDir)..\llvm\Config\config.h&#x0D;&#x0A;"
-                                               AdditionalDependencies="$(SolutionDir)config.h"
-                                               Outputs="$(ProjectDir)..\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;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\Config\config.h&quot;"
                                        />
                                </FileConfiguration>
                        </File>
@@ -126,8 +126,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
-                                               CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\Support\DataTypes.h&#x0D;&#x0A;"
-                                               Outputs="$(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>
@@ -140,8 +140,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-                                               CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_map&#x0D;&#x0A;"
-                                               Outputs="$(ProjectDir)..\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;"
                                        />
                                </FileConfiguration>
                        </File>
@@ -154,8 +154,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-                                               CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_set&#x0D;&#x0A;"
-                                               Outputs="$(ProjectDir)..\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;"
                                        />
                                </FileConfiguration>
                        </File>
@@ -168,8 +168,8 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating $(SolutionDir)llvm\ADT\iterator"
-                                               CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\iterator&#x0D;&#x0A;"
-                                               Outputs="$(ProjectDir)..\llvm\ADT\iterator"
+                                               CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator&quot;&#x0D;&#x0A;"
+                                               Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator&quot;"
                                        />
                                </FileConfiguration>
                        </File>