Add an environment variable YASMPATH to override the default vsyasm directory

svn path=/trunk/yasm/; revision=2330

diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props
index c8f8472e30ea74e6a44c26bfd574cff7dd3620dc..66308c4c09a1d266a491380605fde0c58c26168c 100644 (file)
--- a/Mkfiles/vc10/vsyasm.props
+++ b/Mkfiles/vc10/vsyasm.props
@@ -9,13 +9,16 @@
     <YASMDependsOn\r
       Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>\r
   </PropertyGroup>\r
+  <PropertyGroup>\r
+    <YasmPath Condition= "'$(YASMPATH)' == ''">C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\</YasmPath>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <YASM>\r
       <Debug>False</Debug>\r
       <ObjectFile>$(IntDir)</ObjectFile>\r
       <PreProc>0</PreProc>\r
       <Parser>0</Parser>\r
-      <CommandLineTemplate>"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vsyasm" -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>\r
+      <CommandLineTemplate>"$(YasmPath)"vsyasm.exe -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>\r
       <Outputs>%(ObjectFile)</Outputs>\r
       <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>\r
       <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>\r