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

GN/Windows: fiddle links and runs

Browse Source 
BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3220

Change-Id: Ia8a47d4304a6b8e73b5ef068da9a5ac218ef3f72
Reviewed-on: https://skia-review.googlesource.com/3220
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2016-10-11 17:49:33 -04:00 committed by Skia Commit-Bot
parent df44fc5f2b
commit ae7e671f86
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BUILD.gn
View File

@ -19,7 +19,7 @@ declare_args() {
skia_use_libpng = true
skia_use_libwebp = !is_fuchsia
skia_use_mesa = false
skia_use_sfntly = !is_fuchsia
skia_use_sfntly = !is_fuchsia && !is_win # TODO: icu on Windows, re-enable this.
skia_use_vulkan = is_android && defined(ndk_api) && ndk_api >= 24
skia_use_zlib = true
@ -58,7 +58,10 @@ skia_public_includes = [
# Skia public API, generally provided by :skia.
config("skia_public") {
include_dirs = skia_public_includes
defines = [ "SKIA_DLL" ]
defines = []
if (is_component_build) {
defines += [ "SKIA_DLL" ]
}
if (is_fuchsia || is_linux) {
defines += [ "SK_SAMPLES_FOR_X" ]
}
@ -535,6 +538,7 @@ component("skia") {
if (is_win) {
sources += [
"src/fonts/SkFontMgr_indirect.cpp",
"src/ports/SkDebug_win.cpp",
"src/ports/SkFontHost_win.cpp",
"src/ports/SkFontMgr_win_dw.cpp",
@ -550,6 +554,7 @@ component("skia") {
]
sources -=
[ get_path_info("src/utils/SkThreadUtils_pthread.cpp", "abspath") ]
libs += [ "User32.lib" ] # For SkFontMgr_win_dw.cpp.
} else {
sources += [
"src/ports/SkOSFile_posix.cpp",