mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 12:47:59 +08:00
ba1c3aa63e
* [libvpx] switch from yasm to nasm
* [vcpkg] install nasm on azure for osx
* Revert "[vcpkg] install nasm on azure for osx"
This reverts commit f65ad1bdad.
* [VMSS] Install nasm on OSX
* [libvpx] bump port version
* [libvpx] Add --as=nasm for non-MSVC triplets
* [libvpx] Fix nasm debug format flag
* Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Long Nguyen <nguyen.long.908132@gmail.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
|
|
index bb1c31d23..b634b0609 100755
|
|
--- a/build/make/gen_msvs_vcxproj.sh
|
|
+++ b/build/make/gen_msvs_vcxproj.sh
|
|
@@ -247,13 +247,13 @@ libs=${libs// /;}
|
|
case "$target" in
|
|
x86_64*)
|
|
platforms[0]="x64"
|
|
- asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)""
|
|
- asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)""
|
|
+ asm_Debug_cmdline="nasm -Xvc -gcv8 -f win64 ${yasmincs} "%(FullPath)""
|
|
+ asm_Release_cmdline="nasm -Xvc -f win64 ${yasmincs} "%(FullPath)""
|
|
;;
|
|
x86*)
|
|
platforms[0]="Win32"
|
|
- asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""
|
|
- asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""
|
|
+ asm_Debug_cmdline="nasm -Xvc -gcv8 -f win32 ${yasmincs} "%(FullPath)""
|
|
+ asm_Release_cmdline="nasm -Xvc -f win32 ${yasmincs} "%(FullPath)""
|
|
;;
|
|
arm64*)
|
|
platforms[0]="ARM64"
|