shithub: libvpx

Info  •  Files  •  Log  •  Branches

gen_msvs_(vcx)proj.sh: set yasm format explicitly

use win32/win64 instead of $(PlatformName) (Win32/x64) for compatibility
with yasm 1.3.0. both format types were available since at least 0.8.0

BUG=843

Change-Id: I7917620490d0663b118ff08b96d1e5dbccba3703

--- a/build/make/gen_msvs_proj.sh

+++ b/build/make/gen_msvs_proj.sh

@@ -245,13 +245,13 @@

 case "$target" in

     x86_64*)

         platforms[0]="x64"

-        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)""

-        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)""

+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "\$(InputPath)""

+        asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "\$(InputPath)""

     ;;

     x86*)

         platforms[0]="Win32"

-        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)""

-        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)""

+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "\$(InputPath)""

+        asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "\$(InputPath)""

     ;;

     *) die "Unsupported target $target!"

     ;;

--- a/build/make/gen_msvs_vcxproj.sh

+++ b/build/make/gen_msvs_vcxproj.sh

@@ -253,13 +253,13 @@

 case "$target" in

     x86_64*)

         platforms[0]="x64"

-        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "%(FullPath)""

-        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "%(FullPath)""

+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)""

+        asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)""

     ;;

     x86*)

         platforms[0]="Win32"

-        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "%(FullPath)""

-        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "%(FullPath)""

+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""

+        asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""

     ;;

     arm*)

         asm_Debug_cmdline="armasm -nologo "%(FullPath)""

-- 

⑨