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