| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'visibility%': 'hidden', | 3 'visibility%': 'hidden', |
| 4 'library%': 'static_library', | 4 'library%': 'static_library', |
| 5 'component%': '', | 5 'component%': '', |
| 6 'want_separate_host_toolset': 0, | 6 'want_separate_host_toolset': 0, |
| 7 }, | 7 }, |
| 8 | 8 |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 11 or OS=="netbsd"', { | 11 or OS=="netbsd"', { |
| 12 'target_defaults': { | 12 'target_defaults': { |
| 13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', | 13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |
| 14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', | 14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |
| 15 '-pedantic', | 15 '-pedantic', |
| 16 # Ignore some warnings for googletest | 16 # Ignore some warnings for googletest |
| 17 '-Wno-error=long-long', '-Wno-error=variadic-macros', | 17 '-Wno-error=long-long', '-Wno-error=variadic-macros', |
| 18 '-Wno-error=missing-field-initializers' ], | 18 '-Wno-error=missing-field-initializers' ], |
| 19 'ldflags': [ '-pthread', ], | 19 'ldflags': [ '-pthread', ], |
| 20 }, | 20 }, |
| 21 }], | 21 }], |
| 22 ['OS=="android"', { | |
| 23 'target_defaults': { | |
| 24 'cflags': ['-std=gnu++0x', '-fexceptions', '-frtti'], | |
|
Andrey Novikov
2013/04/30 20:16:05
May be we need other flags, I do not know, I only
| |
| 25 'cflags!': [ | |
| 26 '-pthread', # Not supported by Android toolchain. | |
| 27 ], | |
| 28 'ldflags!': [ | |
| 29 '-pthread', # Not supported by Android toolchain. | |
| 30 ], | |
| 31 'include_dirs': [ | |
| 32 'include', | |
| 33 'third_party/v8/include', | |
| 34 'third_party/googletest/', | |
| 35 'third_party/googletest/include', | |
| 36 'third_party/googletest/include/internal' | |
|
Wladimir Palant
2013/05/07 08:18:54
Is it really necessary to list include directories
| |
| 37 ], | |
| 38 'link_settings': { | |
| 39 'libraries': [ | |
| 40 'android_arm.release/obj.target/tools/gyp/libv8_base.a', | |
| 41 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', | |
|
Wladimir Palant
2013/05/07 08:18:54
These should only be relevant for the libadblockpl
| |
| 42 ], | |
| 43 }, | |
| 44 }, | |
| 45 }], | |
| 22 ], | 46 ], |
| 23 | 47 |
| 24 'target_defaults': { | 48 'target_defaults': { |
| 25 'msvs_cygwin_shell': 0, | 49 'msvs_cygwin_shell': 0, |
| 26 'conditions': [[ | 50 'conditions': [[ |
| 27 'target_arch=="x64"', { | 51 'target_arch=="x64"', { |
| 28 'msvs_configuration_platform': 'x64', | 52 'msvs_configuration_platform': 'x64', |
| 29 } | 53 } |
| 30 ]], | 54 ]], |
| 31 } | 55 } |
| 32 } | 56 } |
| OLD | NEW |