This replaces all $(SolutionDir) macros with $(ProjectDir)..\

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

diff --git a/win32/llvm-dis/llvm-dis.vcproj b/win32/llvm-dis/llvm-dis.vcproj
index ceac0e6c989794a59814effa2399e0e8270f4a72..be2261bf2bcc407c3bd4648e22c551952aba56f4 100644 (file)
--- a/win32/llvm-dis/llvm-dis.vcproj
+++ b/win32/llvm-dis/llvm-dis.vcproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="9.00"
+       Version="8.00"
        Name="llvm-dis"
        ProjectGUID="{B13476BC-30AB-4EA0-BC1E-212C0A459405}"
        Keyword="Win32Proj"
-       TargetFrameworkVersion="131072"
        >
        <Platforms>
                <Platform
@@ -20,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
@@ -76,8 +75,6 @@
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="$(OutDir)/llvm-dis.pdb"
                                SubSystem="1"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
                                TargetMachine="1"
                        />
                        <Tool
@@ -98,16 +95,19 @@
                        <Tool
                                Name="VCAppVerifierTool"
                        />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
                        <Tool
                                Name="VCPostBuildEventTool"
                        />
                </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
@@ -158,8 +158,6 @@
                                SubSystem="1"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
                                TargetMachine="1"
                        />
                        <Tool
@@ -180,13 +178,16 @@
                        <Tool
                                Name="VCAppVerifierTool"
                        />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
                        <Tool
                                Name="VCPostBuildEventTool"
                        />
                </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"
@@ -272,7 +273,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"