Commit 30c8cdf3 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

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

parents 08db5f95 c5795d8f
...@@ -245,13 +245,13 @@ esac ...@@ -245,13 +245,13 @@ esac
case "$target" in case "$target" in
x86_64*) x86_64*)
platforms[0]="x64" platforms[0]="x64"
asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "\$(InputPath)""
asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "\$(InputPath)""
;; ;;
x86*) x86*)
platforms[0]="Win32" platforms[0]="Win32"
asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "\$(InputPath)""
asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)"" asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "\$(InputPath)""
;; ;;
*) die "Unsupported target $target!" *) die "Unsupported target $target!"
;; ;;
......
...@@ -253,13 +253,13 @@ libs=${libs// /;} ...@@ -253,13 +253,13 @@ libs=${libs// /;}
case "$target" in case "$target" in
x86_64*) x86_64*)
platforms[0]="x64" platforms[0]="x64"
asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "%(FullPath)"" asm_Debug_cmdline="yasm -Xvc -g cv8 -f win64 ${yasmincs} "%(FullPath)""
asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "%(FullPath)"" asm_Release_cmdline="yasm -Xvc -f win64 ${yasmincs} "%(FullPath)""
;; ;;
x86*) x86*)
platforms[0]="Win32" platforms[0]="Win32"
asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "%(FullPath)"" asm_Debug_cmdline="yasm -Xvc -g cv8 -f win32 ${yasmincs} "%(FullPath)""
asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "%(FullPath)"" asm_Release_cmdline="yasm -Xvc -f win32 ${yasmincs} "%(FullPath)""
;; ;;
arm*) arm*)
asm_Debug_cmdline="armasm -nologo "%(FullPath)"" asm_Debug_cmdline="armasm -nologo "%(FullPath)""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment