This replaces all $(SolutionDir) macros with $(ProjectDir)..\
Patch by Nicolas Capens!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53571 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 9696927..8a26024 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
@@ -91,7 +91,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -163,7 +163,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\common.vsprops"
@@ -230,7 +230,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -366,9 +366,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing TableGen Step"
- CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
"
+ CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(ProjectDir)..\llvm\intrinsics.gen
"
AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
- Outputs="$(SolutionDir)llvm\intrinsics.gen"
+ Outputs="$(ProjectDir)..\llvm\intrinsics.gen"
/>
</FileConfiguration>
<FileConfiguration
@@ -377,9 +377,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing TableGen Step"
- CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
"
- AdditionalDependencies="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe;$(InputDir)IntrinsicsX86.td"
- Outputs="$(SolutionDir)llvm\intrinsics.gen"
+ CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(ProjectDir)..\llvm\intrinsics.gen
"
+ AdditionalDependencies="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe;$(InputDir)IntrinsicsX86.td"
+ Outputs="$(ProjectDir)..\llvm\intrinsics.gen"
/>
</FileConfiguration>
<FileConfiguration
@@ -388,9 +388,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing TableGen Step"
- CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
"
+ CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(ProjectDir)..\llvm\intrinsics.gen
"
AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td;$(InputDir)IntrinsicsPowerPC.td"
- Outputs="$(SolutionDir)llvm\intrinsics.gen"
+ Outputs="$(ProjectDir)..\llvm\intrinsics.gen"
/>
</FileConfiguration>
<FileConfiguration
@@ -399,9 +399,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing TableGen Step"
- CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(SolutionDir)llvm\intrinsics.gen
"
+ CommandLine="echo Building $(InputFileName) code emitter with tblgen
$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)\TableGen.exe -gen-intrinsic -I ..\..\include $(InputPath) -o $(ProjectDir)..\llvm\intrinsics.gen
"
AdditionalDependencies="$(ProjectDir)..\$(IntDir)\TableGen.exe;$(InputDir)IntrinsicsX86.td"
- Outputs="$(SolutionDir)llvm\intrinsics.gen"
+ Outputs="$(ProjectDir)..\llvm\intrinsics.gen"
/>
</FileConfiguration>
</File>