Fix build with Yasm 1.3.0

Cyberbeing · Oct 1, 2014 · da595cf · da595cf
1 parent c70cd5a
commit da595cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/YASM.props b/src/YASM.props
@@ -11,12 +11,22 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <YASM>
-      <CommandLineTemplate>yasm -X vc -f $(Platform) [Debug] [Defines] [IncludePaths] -o "$(IntDir)%(Filename).obj" "%(FullPath)"</CommandLineTemplate>
+      <CommandLineTemplate>yasm -X vc [Platform] [Debug] [Defines] [IncludePaths] -o "$(IntDir)%(Filename).obj" "%(FullPath)"</CommandLineTemplate>
       <Outputs>$(IntDir)%(Filename).obj</Outputs>
       <ExecutionDescription>YASM: Assembling %(Filename)%(Extension)</ExecutionDescription>
       <Debug>False</Debug>
     </YASM>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <YASM>
+      <Platform>win32</Platform>
+    </YASM>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <YASM>
+      <Platform>win64</Platform>
+    </YASM>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Debug Filter'">
     <YASM>
       <Debug>True</Debug>

diff --git a/src/YASM.targets b/src/YASM.targets
@@ -45,6 +45,7 @@
     <YASM
       Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"
       CommandLineTemplate="%(YASM.CommandLineTemplate)"
+      Platform="%(YASM.Platform)"
       Debug="%(YASM.Debug)"
       Defines="%(YASM.Defines)"
       AdditionalOptions="%(YASM.AdditionalOptions)"

diff --git a/src/YASM.xml b/src/YASM.xml
@@ -25,6 +25,11 @@
         </Category.DisplayName>
       </Category>
     </Rule.Categories>
+    <StringProperty
+      Name="Platform"
+      DisplayName="Platform"
+      Description="Specify the yasm object format"
+      Switch="-f [value]" />
     <BoolProperty
       Name="Debug"
       DisplayName="Debug Information"