summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gladman <brg@gladman.plus.com>2010-05-27 13:26:23 +0000
committerBrian Gladman <brg@gladman.plus.com>2010-05-27 13:26:23 +0000
commitc766e43831ac25dded8d800297908d258a42dda0 (patch)
tree794c92ce84b2c6e4c9667b84c23c12931c447131
parent3a14d898b24de46081335ec79114531c396c72c7 (diff)
downloadyasm-c766e43831ac25dded8d800297908d258a42dda0.tar.gz
Add an environment variable YASMPATH to override the default vsyasm directory
svn path=/trunk/yasm/; revision=2330
-rw-r--r--Mkfiles/vc10/vsyasm.props5
1 files changed, 4 insertions, 1 deletions
diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props
index c8f8472e..66308c4c 100644
--- a/Mkfiles/vc10/vsyasm.props
+++ b/Mkfiles/vc10/vsyasm.props
@@ -9,13 +9,16 @@
<YASMDependsOn
Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>
</PropertyGroup>
+ <PropertyGroup>
+ <YasmPath Condition= "'$(YASMPATH)' == ''">C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\</YasmPath>
+ </PropertyGroup>
<ItemDefinitionGroup>
<YASM>
<Debug>False</Debug>
<ObjectFile>$(IntDir)</ObjectFile>
<PreProc>0</PreProc>
<Parser>0</Parser>
- <CommandLineTemplate>"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vsyasm" -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>
+ <CommandLineTemplate>"$(YasmPath)"vsyasm.exe -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>
<Outputs>%(ObjectFile)</Outputs>
<ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>
<ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>