| Index: gyp/v8.gyp
|
| diff --git a/gyp/v8.gyp b/gyp/v8.gyp
|
| index e39ccbc858fa885dc29561efa158b05c1fa7dc6f..baa0b3a46c09cc99f37abc0137529e39b963ccdf 100644
|
| --- a/gyp/v8.gyp
|
| +++ b/gyp/v8.gyp
|
| @@ -7,50 +7,44 @@
|
| 'mac_bundle' : 1,
|
| 'include_dirs' : [
|
| '../tools/flags',
|
| - '../../../v8/include',
|
| + '../third_party/externals/v8/include',
|
| ],
|
| - 'includes': [],
|
| 'sources': [
|
| - '../experimental/SkV8Example/SkV8Example.h',
|
| '../experimental/SkV8Example/SkV8Example.cpp',
|
| - '../experimental/SkV8Example/Global.h',
|
| + '../experimental/SkV8Example/SkV8Example.h',
|
| '../experimental/SkV8Example/Global.cpp',
|
| - '../experimental/SkV8Example/Path.h',
|
| + '../experimental/SkV8Example/Global.h',
|
| '../experimental/SkV8Example/Path.cpp',
|
| - '../experimental/SkV8Example/JsContext.h',
|
| + '../experimental/SkV8Example/Path.h',
|
| '../experimental/SkV8Example/JsContext.cpp',
|
| + '../experimental/SkV8Example/JsContext.h',
|
| ],
|
| 'dependencies': [
|
| + 'flags.gyp:flags',
|
| 'skia_lib.gyp:skia_lib',
|
| 'views.gyp:views',
|
| 'xml.gyp:xml',
|
| - 'flags.gyp:flags',
|
| ],
|
| + 'link_settings': {
|
| + 'libraries': [
|
|
|
| - 'link_settings': {
|
| - 'libraries': [
|
| -
|
| -# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
|
| -# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
|
| -
|
| -# 'd:/src/v8/build/Debug/lib/icuuc.lib',
|
| -# 'd:/src/v8/build/Debug/lib/icui18n.lib',
|
| -
|
| -# 'Ws2_32.lib',
|
| -# 'Winmm.lib',
|
| +# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
|
| +# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
|
| +# 'd:/src/v8/build/Debug/lib/icuuc.lib',
|
| +# 'd:/src/v8/build/Debug/lib/icui18n.lib',
|
| +# 'Ws2_32.lib',
|
| +# 'Winmm.lib',
|
|
|
| - '-lpthread',
|
| - '-lrt',
|
| - '../../../v8/out/native/obj.target/tools/gyp/libv8_base.x64.a',
|
| - '../../../v8/out/native/obj.target/tools/gyp/libv8_snapshot.a',
|
| -
|
| - '../../../v8/out/native/obj.target/third_party/icu/libicudata.a',
|
| - '../../../v8/out/native/obj.target/third_party/icu/libicui18n.a',
|
| - '../../../v8/out/native/obj.target/third_party/icu/libicuuc.a',
|
| -
|
| - '../../../v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o',
|
| - ],
|
| - },
|
| + '-lpthread',
|
| + '-lrt',
|
| + '../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_base.x64.a',
|
| + '../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_snapshot.a',
|
| + '../third_party/externals/v8/out/native/obj.target/third_party/icu/libicudata.a',
|
| + '../third_party/externals/v8/out/native/obj.target/third_party/icu/libicui18n.a',
|
| + '../third_party/externals/v8/out/native/obj.target/third_party/icu/libicuuc.a',
|
| + '../third_party/externals/v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o',
|
| + ],
|
| + },
|
| 'conditions' : [
|
| [ 'skia_gpu == 1', {
|
| 'include_dirs' : [
|
|
|