[Build-System] Fix build on Windows 11: yasm tool compiled for x86 do…

…es not work on x64 system. Download yasm.exe 64bit instead.
dvillaume · Dec 8, 2022 · 52e97e8 · 52e97e8
1 parent 62d3e52
commit 52e97e8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/w32/yasm.props b/w32/yasm.props
@@ -5,6 +5,9 @@
   </ImportGroup>
   <PropertyGroup>
     <YasmPropsImported>true</YasmPropsImported>
+    <Is64yasm Condition="$([System.Environment]::Is64BitProcess)">true</Is64yasm>
+    <PackageToDownload Condition="'$(Is64yasm)' == 'true'">http://files.freeswitch.org/downloads/win64/yasm.exe</PackageToDownload>
+    <PackageToDownload Condition="'$(Is64yasm)' != 'true'">http://files.freeswitch.org/downloads/win32/yasm.exe</PackageToDownload>
   </PropertyGroup>
 
   <!--
@@ -28,8 +31,9 @@
    -->
 
   <Target Name="YasmDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="">
+      <Message Text="System is 64 bit." Condition="'$(Is64yasm)' == 'true'" Importance="High" />
       <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/win32/yasm.exe"
+           package="$(PackageToDownload)"
            expectfileordirectory="$(ProjectDir)\yasm.exe"
            outputfolder="$(ProjectDir)\"
            outputfilename=""