Add NaCl port of Skia

Initial commit. This is far from done.
Review URL: https://codereview.appspot.com/6428064

git-svn-id: http://skia.googlecode.com/svn/trunk@5398 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
borenet@google.com 2012-09-04 21:09:40 +00:00
parent 5125d84433
commit a98eb919a2
3 changed files with 36 additions and 13 deletions

View File

@ -71,6 +71,7 @@
'skia_arch_type%': 'x86', 'skia_arch_type%': 'x86',
'skia_directwrite%': 0, 'skia_directwrite%': 0,
'android_make_apk%': 1, 'android_make_apk%': 1,
'skia_nacl%': 0,
'skia_gpu%': 1, 'skia_gpu%': 1,
'skia_static_initializers%': 1, 'skia_static_initializers%': 1,
}, },
@ -87,6 +88,7 @@
'skia_arch_width%': '<(skia_arch_width)', 'skia_arch_width%': '<(skia_arch_width)',
'skia_directwrite%': '<(skia_directwrite)', 'skia_directwrite%': '<(skia_directwrite)',
'android_make_apk%': '<(android_make_apk)', 'android_make_apk%': '<(android_make_apk)',
'skia_nacl%': '<(skia_nacl)',
'skia_gpu%': '<(skia_gpu)', 'skia_gpu%': '<(skia_gpu)',
'skia_static_initializers%': '<(skia_static_initializers)', 'skia_static_initializers%': '<(skia_static_initializers)',

View File

@ -37,23 +37,36 @@
], ],
'conditions': [ 'conditions': [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'defines': [ 'conditions': [
#The font host requires at least FreeType 2.3.0 at runtime. [ 'skia_nacl', {
'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', 'defines': [
'SK_CAN_USE_DLOPEN=1', 'SK_CAN_USE_DLOPEN=0',
],
'sources': [
'../src/ports/SkFontHost_none.cpp',
],
}, {
'defines': [
#The font host requires at least FreeType 2.3.0 at runtime.
'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',
'SK_CAN_USE_DLOPEN=1',
],
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
'../src/ports/SkFontHost_linux.cpp',
],
'link_settings': {
'libraries': [
'-lfreetype',
'-ldl',
],
},
}],
], ],
'sources': [ 'sources': [
'../src/ports/SkThread_pthread.cpp', '../src/ports/SkThread_pthread.cpp',
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
'../src/ports/SkFontHost_linux.cpp',
], ],
'link_settings': {
'libraries': [
'-lfreetype',
'-ldl',
],
},
}], }],
[ 'skia_os == "mac"', { [ 'skia_os == "mac"', {
'include_dirs': [ 'include_dirs': [

View File

@ -164,6 +164,14 @@
'../src/utils/win/SkIStream.cpp', '../src/utils/win/SkIStream.cpp',
], ],
}], }],
[ 'skia_nacl == 1', {
'sources': [
'../src/utils/SkThreadUtils_pthread_other.cpp',
],
'sources!': [
'../src/utils/SkThreadUtils_pthread_linux.cpp',
],
}],
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [