Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: gyp/libjpeg-turbo.gyp

Issue 1229303002: Fix msvs builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'xcode_settings': { 6 'xcode_settings': {
7 'SYMROOT': '<(DEPTH)/xcodebuild', 7 'SYMROOT': '<(DEPTH)/xcodebuild',
8 }, 8 },
9 'variables': { 9 'variables': {
10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo', 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo',
11 'conditions': [ 11 'conditions': [
12 [ 'skia_os == "win"', { 12 [ 'skia_os == "win"', {
13 'object_suffix': 'obj', 13 'object_suffix': 'obj',
14 }, { 14 }, {
15 'object_suffix': 'o', 15 'object_suffix': 'o',
16 }], 16 }],
17 ], 17 ],
18 }, 18 },
19 'targets': [ 19 'targets': [
20 { 20 {
21 'target_name': 'yasm-win',
22 'type': 'executable',
23 'sources': [
24 '../third_party/externals/yasm/binaries/win/yasm.exe',
25 ],
26 'copies' : [{
27 'destination': '<(PRODUCT_DIR)',
28 'files': [ '../third_party/externals/yasm/binaries/win/yasm.exe' ],
29 }],
30 },
31 {
21 'target_name': 'libjpeg-turbo', 32 'target_name': 'libjpeg-turbo',
22 'type': 'static_library', 33 'type': 'static_library',
23 'include_dirs': [ 34 'include_dirs': [
24 '../third_party/externals/libjpeg-turbo/', 35 '../third_party/externals/libjpeg-turbo/',
25 ], 36 ],
26 'defines': [ 37 'defines': [
27 'WITH_SIMD', 38 'WITH_SIMD',
28 'MOTION_JPEG_SUPPORTED', 39 'MOTION_JPEG_SUPPORTED',
29 'NO_GETENV', 40 'NO_GETENV',
30 ], 41 ],
31 'cflags': [ 42 'cflags': [
32 '-w', # supresses warnings 43 '-w', # supresses warnings
33 ], 44 ],
34 'msvs_settings': { 45 'msvs_settings': {
35 'VCCLCompilerTool': { 46 'VCCLCompilerTool': {
36 'AdditionalOptions': [ 47 'WarningLevel': '0',
37 '/w',
38 ],
39 }, 48 },
40 }, 49 },
41 'xcode_settings': { 50 'xcode_settings': {
42 'WARNING_CFLAGS': [ 51 'WARNING_CFLAGS': [
43 '-w', 52 '-w',
44 ], 53 ],
45 }, 54 },
46 'sources': [ 55 'sources': [
47 '../third_party/externals/libjpeg-turbo/jaricom.c', 56 '../third_party/externals/libjpeg-turbo/jaricom.c',
48 '../third_party/externals/libjpeg-turbo/jcapimin.c', 57 '../third_party/externals/libjpeg-turbo/jcapimin.c',
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 }, { 221 }, {
213 'sources': [ 222 'sources': [
214 '../third_party/externals/libjpeg-turbo/jsimd_none.c', 223 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
215 ], 224 ],
216 }], 225 }],
217 ], 226 ],
218 }], 227 }],
219 228
220 # Build rules for an asm file. 229 # Build rules for an asm file.
221 # On Windows, we use the precompiled yasm binary. 230 # On Windows, we use the precompiled yasm binary.
222 # On Linux, we build our patched yasm and use it except when use_system_ yasm is 1. 231 # On Linux, we build our patched yasm and use it.
223 # On Mac, we always build our patched yasm and use it. 232 # On Mac, we always build our patched yasm and use it.
224 [ 'skia_os == "win"', { 233 [ 'skia_os == "win"', {
234 'dependencies': [
235 'yasm-win',
236 ],
225 'variables': { 237 'variables': {
226 'yasm_path': '../third_party/externals/yasm/binaries/win/yasm.exe', 238 'yasm_path': '<(PRODUCT_DIR)/yasm.exe',
227 'conditions': [ 239 'conditions': [
228 [ 'skia_arch_type == "x86"', { 240 [ 'skia_arch_type == "x86"', {
229 'yasm_format': '-fwin32', 241 'yasm_format': '-fwin32',
230 'yasm_flags': [ 242 'yasm_flags': [
231 '-D__x86__', 243 '-D__x86__',
232 '-DWIN32', 244 '-DWIN32',
233 '-DMSVC', 245 '-DMSVC',
234 '-Iwin/' 246 '-Iwin/'
235 ], 247 ],
236 }, { 248 }, {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 ], 354 ],
343 'process_outputs_as_sources': 1, 355 'process_outputs_as_sources': 1,
344 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 356 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
345 }], 357 }],
346 ] 358 ]
347 }, 359 },
348 ], 360 ],
349 }, 361 },
350 ], 362 ],
351 } 363 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698