llvm-mc/x86: Rename X86Operand::ScaleReg to IndexReg and make order consistent

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

diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 68edf911001ce5dcc78ec0410bec55545e814355..2ce6f46042849692774b70ae2777664affdd3822 100644 (file)
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -19,10 +19,10 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -70,7 +70,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
+                               AdditionalDependencies="$(ProjectDir)..\X86\$(IntDir)\X86TargetMachine.obj $(ProjectDir)..\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
@@ -105,10 +105,10 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -153,7 +153,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
+                               AdditionalDependencies="$(ProjectDir)..\X86\$(IntDir)\X86TargetMachine.obj $(ProjectDir)..\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
@@ -189,7 +189,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -241,7 +241,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
+                               AdditionalDependencies="$(ProjectDir)..\X86\$(IntDir)\X86TargetMachine.obj $(ProjectDir)..\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
@@ -276,7 +276,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -325,7 +325,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
+                               AdditionalDependencies="$(ProjectDir)..\X86\$(IntDir)\X86TargetMachine.obj $(ProjectDir)..\CBackend\$(IntDir)\CBackend.obj"
                                OutputFile="$(OutDir)/llc.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"