AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support x86 build with VS 2015

Browse Source 
Pass extra assembler flags to the asm tool in msvc toolchain

My first commit so added my name to the AUTHORS file.

Change-Id: I19529a901be6d9c00df3c0880003be3363475c6e
Reviewed-on: https://skia-review.googlesource.com/114740
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Kaloyan Donev 2018-03-16 14:45:35 +02:00 committed by Skia Commit-Bot
parent a3ecaf5fcf
commit f7466bd84a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -49,3 +49,4 @@ Christian Plesner Hansen <plesner@t.undra.org>
Marco Alesiani <marco.diiga@gmail.com>
Adobe Systems Incorporated <*@adobe.com>
Yandex LLC <*@yandex-team.ru>
Kaloyan Donev <kdonev@gmail.com>

8
gn/toolchain/BUILD.gn
View File

@ -34,7 +34,11 @@ toolchain("msvc") {
lib_dir_switch = "/LIBPATH:"
if (msvc == 2015) {
bin = "$win_vc/bin/amd64"
if (target_cpu == "x86") {
bin = "$win_vc/bin"
} else {
bin = "$win_vc/bin/amd64"
}
} else {
bin = "$win_vc/Tools/MSVC/$win_toolchain_version/bin/HostX64/$target_cpu"
}
@ -64,7 +68,7 @@ toolchain("msvc") {
if (target_cpu == "x64") {
_ml += "64"
}
command = "$env_setup $bin/$_ml.exe /nologo /c /Fo {{output}} {{source}}"
command = "$env_setup $bin/$_ml.exe {{asmflags}} /nologo /c /Fo {{output}} {{source}}"
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
]