Add ppapi, improve Windows GN build.
This adds ppapi-related targets except the tests to the GN build. Did some minor tweaks to the .gypi ppapi lists. Some files were duplicated between the trusted and common lists which causes errors in GN (it doesn't uniquify the lists like GYP). Common is used in every place trusted is, so I just removed the duplicates from the trusted list. Fixed some warnings in skia and tcmalloc. Added the ability to undefine NOMINMAX on Windows. Fixed some src/ui Windows compilation issues. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/305513003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@273016 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d6d023e1c7
Коммит
76ee517b74
|
@ -323,6 +323,7 @@ _native_compiler_configs = [
|
|||
if (is_win) {
|
||||
_native_compiler_configs += [
|
||||
"//build/config/win:lean_and_mean",
|
||||
"//build/config/win:nominmax",
|
||||
"//build/config/win:sdk",
|
||||
"//build/config/win:unicode",
|
||||
]
|
||||
|
|
|
@ -15,7 +15,6 @@ config("sdk") {
|
|||
"_WIN32_WINNT=0x0602",
|
||||
"_WINDOWS",
|
||||
"CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
|
||||
"NOMINMAX",
|
||||
"NTDDI_VERSION=0x06020000",
|
||||
"PSAPI_VERSION=1",
|
||||
"WIN32",
|
||||
|
@ -129,3 +128,15 @@ config("lean_and_mean") {
|
|||
"WIN32_LEAN_AND_MEAN",
|
||||
]
|
||||
}
|
||||
|
||||
# Nominmax --------------------------------------------------------------------
|
||||
|
||||
# Some third party code defines NOMINMAX before including windows.h, which
|
||||
# then causes warnings when it's been previously defined on the command line.
|
||||
# For such targets, this config can be removed.
|
||||
|
||||
config("nominmax") {
|
||||
defines = [
|
||||
"NOMINMAX",
|
||||
]
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче