| OLD | NEW |
| 1 # conditions used in both common.gypi and skia.gyp in chromium | 1 # conditions used in both common.gypi and skia.gyp in chromium |
| 2 # | 2 # |
| 3 { | 3 { |
| 4 'defines': [ | 4 'defines': [ |
| 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', | 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', |
| 7 ], | 7 ], |
| 8 'conditions' : [ | 8 'conditions' : [ |
| 9 [ 'skia_gpu == 1', | 9 [ 'skia_gpu == 1', |
| 10 { | 10 { |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 'AdditionalOptions': [ | 110 'AdditionalOptions': [ |
| 111 '/we4189', # initialized but unused var warning | 111 '/we4189', # initialized but unused var warning |
| 112 ], | 112 ], |
| 113 }, | 113 }, |
| 114 }, | 114 }, |
| 115 }], | 115 }], |
| 116 ], | 116 ], |
| 117 }, | 117 }, |
| 118 ], | 118 ], |
| 119 | 119 |
| 120 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', | 120 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
| 121 { | 121 { |
| 122 'defines': [ | 122 'defines': [ |
| 123 'SK_SAMPLES_FOR_X', | 123 'SK_SAMPLES_FOR_X', |
| 124 'SK_BUILD_FOR_UNIX', | 124 'SK_BUILD_FOR_UNIX', |
| 125 ], | 125 ], |
| 126 'configurations': { | 126 'configurations': { |
| 127 'Debug': { | 127 'Debug': { |
| 128 'cflags': ['-g'] | 128 'cflags': ['-g'] |
| 129 }, | 129 }, |
| 130 'Release': { | 130 'Release': { |
| 131 'cflags': ['-O3 -g'], | 131 'cflags': ['-O3 -g'], |
| 132 'defines': [ 'NDEBUG' ], | 132 'defines': [ 'NDEBUG' ], |
| 133 }, | 133 }, |
| 134 }, | 134 }, |
| 135 'cflags': [ | 135 'cflags': [ |
| 136 '-Wall', | 136 '-Wall', |
| 137 '-Wextra', | 137 '-Wextra', |
| 138 # suppressions below here were added for clang | 138 # suppressions below here were added for clang |
| 139 '-Wno-unused-parameter', | 139 '-Wno-unused-parameter', |
| 140 '-Wno-c++11-extensions' | 140 '-Wno-c++11-extensions' |
| 141 ], | 141 ], |
| 142 'conditions' : [ | 142 'conditions' : [ |
| 143 [ 'skia_warnings_as_errors', { | 143 [ 'skia_warnings_as_errors', { |
| 144 'cflags': [ | 144 'cflags': [ |
| 145 '-Werror', | 145 '-Werror', |
| 146 ], | 146 ], |
| 147 }], | 147 }], |
| 148 [ 'skia_arch_width == 64', { | |
| 149 'cflags': [ | |
| 150 '-m64', | |
| 151 ], | |
| 152 'ldflags': [ | |
| 153 '-m64', | |
| 154 ], | |
| 155 }], | |
| 156 [ 'skia_arch_width == 32', { | |
| 157 'cflags': [ | |
| 158 '-m32', | |
| 159 ], | |
| 160 'ldflags': [ | |
| 161 '-m32', | |
| 162 ], | |
| 163 }], | |
| 164 [ 'skia_os == "nacl"', { | 148 [ 'skia_os == "nacl"', { |
| 165 'defines': [ | 149 'defines': [ |
| 166 'SK_BUILD_FOR_NACL', | 150 'SK_BUILD_FOR_NACL', |
| 167 ], | 151 ], |
| 168 'link_settings': { | 152 'link_settings': { |
| 169 'libraries': [ | 153 'libraries': [ |
| 170 '-lppapi', | 154 '-lppapi', |
| 171 '-lppapi_cpp', | 155 '-lppapi_cpp', |
| 172 '-lnosys', | 156 '-lnosys', |
| 173 '-pthread', | 157 '-pthread', |
| 174 ], | 158 ], |
| 175 }, | 159 }, |
| 176 }, { # skia_os != "nacl" | 160 }, { # skia_os != "nacl" |
| 177 'include_dirs' : [ | 161 'include_dirs' : [ |
| 178 '/usr/include/freetype2', | 162 '/usr/include/freetype2', |
| 179 ], | 163 ], |
| 180 }], | 164 }], |
| 165 [ 'skia_os == "chromeos"', { |
| 166 'ldflags': [ |
| 167 '--sysroot=/build/<(skia_cros_target)', |
| 168 '-lstdc++', |
| 169 '-lm', |
| 170 ], |
| 171 }, { |
| 172 'conditions': [ |
| 173 [ 'skia_arch_width == 64', { |
| 174 'cflags': [ |
| 175 '-m64', |
| 176 ], |
| 177 'ldflags': [ |
| 178 '-m64', |
| 179 ], |
| 180 }], |
| 181 [ 'skia_arch_width == 32', { |
| 182 'cflags': [ |
| 183 '-m32', |
| 184 ], |
| 185 'ldflags': [ |
| 186 '-m32', |
| 187 ], |
| 188 }], |
| 189 ], |
| 190 }], |
| 181 ], | 191 ], |
| 182 }, | 192 }, |
| 183 ], | 193 ], |
| 184 | 194 |
| 185 [ 'skia_os == "mac"', | 195 [ 'skia_os == "mac"', |
| 186 { | 196 { |
| 187 'variables': { | 197 'variables': { |
| 188 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', | 198 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', |
| 189 }, | 199 }, |
| 190 'defines': [ | 200 'defines': [ |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 'xcode_settings': { | 414 'xcode_settings': { |
| 405 'SYMROOT': '<(DEPTH)/xcodebuild', | 415 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 406 }, | 416 }, |
| 407 } | 417 } |
| 408 | 418 |
| 409 # Local Variables: | 419 # Local Variables: |
| 410 # tab-width:2 | 420 # tab-width:2 |
| 411 # indent-tabs-mode:nil | 421 # indent-tabs-mode:nil |
| 412 # End: | 422 # End: |
| 413 # vim: set expandtab tabstop=2 shiftwidth=2: | 423 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |