From 3cd873d01daaa5e2d4a81f5e2eaf563ea0e81990 Mon Sep 17 00:00:00 2001
From: gladman <brg@gladman.plus.com>
Date: Thu, 27 May 2010 11:09:59 +0000
Subject: [PATCH] Allow YASM path to be set by an environment variable
 (YASMPATH)

---
 build.vc10/vsyasm.props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.vc10/vsyasm.props b/build.vc10/vsyasm.props
index c8f8472e..95d2ff4f 100644
--- a/build.vc10/vsyasm.props
+++ b/build.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\vsyasm</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)" -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>
       <Outputs>%(ObjectFile)</Outputs>
       <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>
       <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>