mozilla
/
moz-skia
зеркало из https://github.com/mozilla/moz-skia.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Gyp changes for NaCl debugger 

Review URL: https://codereview.chromium.org/12544011

git-svn-id: http://skia.googlecode.com/svn/trunk@8015 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
borenet@google.com 2013-03-07 15:33:28 +00:00
Родитель 3c1ea3a7e5
Коммит 327b9b205a
6 изменённых файлов: 106 добавлений и 59 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
gyp/core.gyp
Просмотреть файл

@ -83,9 +83,9 @@
'../src/core/SkMMapStream.cpp',
],
}],
[ 'skia_os == "android"', {
[ 'skia_os in ("android", "nacl")', {
'dependencies': [
'freetype.gyp:freetype',
'freetype.gyp:freetype',
],
}],
[ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {

140
gyp/debugger.gyp
Просмотреть файл

@ -79,15 +79,12 @@
'include_dirs' : [
'../src/core',
'../debugger', # To pull SkDebugger.h
'../debugger/QT', # For all the QT UI Goodies
'../src/gpu', # To pull gl/GrGLUtil.h
'../src/ports', # To pull SkFontDescriptor.h
'../bench',
'../tools',
'<@(qt_includes)',
],
'sources': [
'../debugger/debuggermain.cpp',
'../debugger/SkDebugCanvas.h',
'../debugger/SkDebugCanvas.cpp',
'../debugger/SkDebugger.cpp',
@ -95,34 +92,6 @@
'../debugger/SkDrawCommand.cpp',
'../debugger/SkObjectParser.h',
'../debugger/SkObjectParser.cpp',
'../debugger/QT/SkDebuggerGUI.cpp',
'../debugger/QT/SkDebuggerGUI.h',
'../debugger/QT/SkCanvasWidget.cpp',
'../debugger/QT/SkCanvasWidget.h',
'../debugger/QT/SkInspectorWidget.h',
'../debugger/QT/SkInspectorWidget.cpp',
'../debugger/QT/SkListWidget.h',
'../debugger/QT/SkListWidget.cpp',
'../debugger/QT/SkSettingsWidget.h',
'../debugger/QT/SkSettingsWidget.cpp',
'../debugger/QT/SkGLWidget.h',
'../debugger/QT/SkGLWidget.cpp',
'../debugger/QT/SkRasterWidget.h',
'../debugger/QT/SkRasterWidget.cpp',
'../debugger/QT/SkImageWidget.h',
'../debugger/QT/SkImageWidget.cpp',
# To update this file edit SkIcons.qrc and rerun rcc to generate cpp
'../debugger/QT/qrc_SkIcons.cpp',
# Generated MOC files
'<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
'<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
'<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
'<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
'<(moc_gen_dir)/moc_SkRasterWidget.cpp',
'<(moc_gen_dir)/moc_SkImageWidget.cpp',
'<(moc_gen_dir)/moc_SkGLWidget.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
@ -130,36 +99,95 @@
'effects.gyp:effects',
'bench.gyp:bench_timer',
'tools.gyp:picture_renderer',
'debugger_mocs',
],
'link_settings': {
'libraries': [
'<@(qt_libs)',
],
},
'conditions': [
[ 'skia_os == "nacl"', {
'dependencies': [
'utils.gyp:utils', # For SkBase64.h
],
'include_dirs': [
'../src/utils',
],
'sources': [
'../../nacl/src/nacl_debugger.cpp',
],
}, { # skia_os != "nacl"
'include_dirs': [
'../debugger/QT', # For all the QT UI Goodies
'<@(qt_includes)',
],
'sources': [
'../debugger/debuggermain.cpp',
'../debugger/QT/SkDebuggerGUI.cpp',
'../debugger/QT/SkDebuggerGUI.h',
'../debugger/QT/SkCanvasWidget.cpp',
'../debugger/QT/SkCanvasWidget.h',
'../debugger/QT/SkInspectorWidget.h',
'../debugger/QT/SkInspectorWidget.cpp',
'../debugger/QT/SkListWidget.h',
'../debugger/QT/SkListWidget.cpp',
'../debugger/QT/SkSettingsWidget.h',
'../debugger/QT/SkSettingsWidget.cpp',
'../debugger/QT/SkGLWidget.h',
'../debugger/QT/SkGLWidget.cpp',
'../debugger/QT/SkRasterWidget.h',
'../debugger/QT/SkRasterWidget.cpp',
'../debugger/QT/SkImageWidget.h',
'../debugger/QT/SkImageWidget.cpp',
# To update this file edit SkIcons.qrc and rerun rcc to generate cpp
'../debugger/QT/qrc_SkIcons.cpp',
# Generated MOC files
'<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
'<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
'<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
'<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
'<(moc_gen_dir)/moc_SkRasterWidget.cpp',
'<(moc_gen_dir)/moc_SkImageWidget.cpp',
'<(moc_gen_dir)/moc_SkGLWidget.cpp',
],
'dependencies': [
'debugger_qt_mocs',
],
'link_settings': {
'libraries': [
'<@(qt_libs)',
],
},
}],
],
},
{
'target_name': 'debugger_mocs',
'type': 'none',
'sources': [
'<(moc_src_dir)/SkCanvasWidget.h',
'<(moc_src_dir)/SkDebuggerGUI.h',
'<(moc_src_dir)/SkInspectorWidget.h',
'<(moc_src_dir)/SkSettingsWidget.h',
'<(moc_src_dir)/SkRasterWidget.h',
'<(moc_src_dir)/SkImageWidget.h',
'<(moc_src_dir)/SkGLWidget.h',
],
'rules': [
],
'conditions': [
[ 'skia_os != "nacl"', {
'targets': [
{
'rule_name': 'generate_moc',
'extension': 'h',
'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
'target_name': 'debugger_qt_mocs',
'type': 'none',
'sources': [
'<(moc_src_dir)/SkCanvasWidget.h',
'<(moc_src_dir)/SkDebuggerGUI.h',
'<(moc_src_dir)/SkInspectorWidget.h',
'<(moc_src_dir)/SkSettingsWidget.h',
'<(moc_src_dir)/SkRasterWidget.h',
'<(moc_src_dir)/SkImageWidget.h',
'<(moc_src_dir)/SkGLWidget.h',
],
'rules': [
{
'rule_name': 'generate_moc',
'extension': 'h',
'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
'<(RULE_INPUT_PATH)',
'-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
},
],
},
],
},
}],
],
}

2
gyp/everything.gyp
Просмотреть файл

@ -14,7 +14,7 @@
'type': 'none',
'dependencies': ['most.gyp:most'],
'conditions': [
['skia_os in ("ios", "android", "nacl") or (skia_os == "mac" and skia_arch_width == 32)', {
['skia_os in ("ios", "android") or (skia_os == "mac" and skia_arch_width == 32)', {
# debugger is not supported on this platform
}, {
'dependencies': [ 'debugger.gyp:debugger' ],

1
gyp/images.gyp
Просмотреть файл

@ -106,6 +106,7 @@
],
'libraries': [
'-lpng',
'-lz',
],
},
# end libpng stuff

9
gyp/tests.gyp
Просмотреть файл

@ -130,6 +130,15 @@
'../src/gpu',
],
}],
[ 'skia_os == "nacl"', {
# CityHash is not supported on NaCl because the NaCl toolchain is
# missing byteswap.h which is needed by CityHash.
# TODO(borenet): Find a way to either provide this dependency or
# replace it.
'sources!': [
'../tests/ChecksumTest.cpp',
],
}],
],
},
],

9
gyp/utils.gyp
Просмотреть файл

@ -196,6 +196,15 @@
],
'sources!': [
'../src/utils/SkThreadUtils_pthread_linux.cpp',
'../src/utils/SkCityHash.cpp',
'../src/utils/SkCityHash.h',
],
'dependencies!': [
# CityHash is not supported on NaCl because the NaCl toolchain is
# missing byteswap.h which is needed by CityHash.
# TODO(borenet): Find a way to either provide this dependency or
# replace it.
'cityhash',
],
}],
[ 'skia_os == "android"', {