]> granicus.if.org Git - libvpx/commitdiff
Add ARM64 support to VS project generation
authorJon Kunkee <jkunkee@microsoft.com>
Thu, 15 Nov 2018 21:01:04 +0000 (13:01 -0800)
committerJon Kunkee <jkunkee@microsoft.com>
Thu, 15 Nov 2018 23:04:31 +0000 (23:04 +0000)
Windows builds can use msbuild.exe to build libvpx through a set of
generated Visual Studio project files. This commit adds awareness of
ARM64 Windows to this process by adding ARM64 configurations and
setting msbuild properties to consume the right SDK version.

Change-Id: I1bbc01cbe7be3d53c4e1af6cd96c6e4170aa4915

build/make/gen_msvs_vcxproj.sh

index 171d0b99b6e8f4df2d13469abf1c0120e42b4c19..ae2b1cd4c8be6f2fb97005bd24f8088d0f9117d5 100755 (executable)
@@ -261,6 +261,11 @@ case "$target" in
         asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} &quot;%(FullPath)&quot;"
         asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} &quot;%(FullPath)&quot;"
     ;;
+    arm64*)
+        platforms[0]="ARM64"
+        asm_Debug_cmdline="armasm64 -nologo -oldit &quot;%(FullPath)&quot;"
+        asm_Release_cmdline="armasm64 -nologo -oldit &quot;%(FullPath)&quot;"
+    ;;
     arm*)
         platforms[0]="ARM"
         asm_Debug_cmdline="armasm -nologo -oldit &quot;%(FullPath)&quot;"
@@ -307,6 +312,16 @@ generate_vcxproj() {
             tag_content ApplicationType "Windows Store"
             tag_content ApplicationTypeRevision 8.1
         fi
+        if [ $vs_ver -eq 15 ] && [ "${platforms[0]}" = "ARM64" ]; then
+            # Require the first Visual Studio version to have ARM64 support.
+            tag_content MinimumVisualStudioVersion 15.9
+            # Require a Windows SDK that has ARM64 support rather than the
+            # default of 8.1.
+            # Since VS 15 does not have a 'use latest SDK version' facility,
+            # set WindowsTargetPlatformVersion to the first official SDK
+            # version to have ARM64 support.
+            tag_content WindowsTargetPlatformVersion 10.0.17134.0
+        fi
     close_tag PropertyGroup
 
     tag Import \