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

Side by Side Diff: libjpeg.gyp

Issue 9301013: Disable ULDI on reference to libjpeg_turbo (vs2010) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 8 years, 10 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 | Annotate | Revision Log
« 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
8 'conditions': [ 8 'conditions': [
9 [ 'chromeos == 1 or (os_posix == 1 and \ 9 [ 'chromeos == 1 or (os_posix == 1 and \
10 OS != "mac" and OS != "linux" and OS != "android")', { 10 OS != "mac" and OS != "linux" and OS != "android")', {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 'jquant2.c', 91 'jquant2.c',
92 'jutils.c', 92 'jutils.c',
93 'jversion.h', 93 'jversion.h',
94 ], 94 ],
95 'direct_dependent_settings': { 95 'direct_dependent_settings': {
96 'include_dirs': [ 96 'include_dirs': [
97 '.', 97 '.',
98 ], 98 ],
99 }, 99 },
100 'msvs_disabled_warnings': [4018, 4101], 100 'msvs_disabled_warnings': [4018, 4101],
101 # VS2010 does not correctly incrementally link obj files generated
102 # from asm files. This flag disables UseLibraryDependencyInputs to
103 # avoid this problem.
104 'msvs_2010_disable_uldi_when_referenced': 1,
101 'conditions': [ 105 'conditions': [
102 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}], 106 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}],
103 # Add target-specific source files. 107 # Add target-specific source files.
104 [ 'target_arch=="ia32"', { 108 [ 'target_arch=="ia32"', {
105 'sources': [ 109 'sources': [
106 'simd/jsimd_i386.c', 110 'simd/jsimd_i386.c',
107 'simd/jccolmmx.asm', 111 'simd/jccolmmx.asm',
108 'simd/jccolss2.asm', 112 'simd/jccolss2.asm',
109 'simd/jcgrammx.asm', 113 'simd/jcgrammx.asm',
110 'simd/jcgrass2.asm', 114 'simd/jcgrass2.asm',
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 ], 291 ],
288 }], 292 }],
289 ], 293 ],
290 } 294 }
291 295
292 # Local Variables: 296 # Local Variables:
293 # tab-width:2 297 # tab-width:2
294 # indent-tabs-mode:nil 298 # indent-tabs-mode:nil
295 # End: 299 # End:
296 # vim: set expandtab tabstop=2 shiftwidth=2: 300 # vim: set expandtab tabstop=2 shiftwidth=2:
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