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

Side by Side Diff: skia/SConscript

Issue 16477: Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the (Closed)
Patch Set: Created 11 years, 12 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 | « sdch/SConscript ('k') | testing/SConscript.gtest » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 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 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.Prepend( 9 env.Prepend(
10 CPPPATH = [ 10 CPPPATH = [
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 # TODO(rspangler): This step forces -Zi, but doesn't actually use it. Need to 450 # TODO(rspangler): This step forces -Zi, but doesn't actually use it. Need to
451 # fix so it doesn't override our -Z7. -Zi also causes vc80.pdb to be created 451 # fix so it doesn't override our -Z7. -Zi also causes vc80.pdb to be created
452 # in the skia directory. 452 # in the skia directory.
453 # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 453 # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created.
454 # It's a 0-length file so likely harmless. Is this a side effect of having 454 # It's a 0-length file so likely harmless. Is this a side effect of having
455 # IncrediBuild installed on the build machine? 455 # IncrediBuild installed on the build machine?
456 pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc') 456 pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
457 env_p['PCH'] = pch 457 env_p['PCH'] = pch
458 input_files.Replace('precompiled.cc', obj) 458 input_files.Replace('precompiled.cc', obj)
459 459
460 env.ChromeStaticLibrary('skia', input_files) 460 env.ChromeLibrary('skia', input_files)
461 461
462 p = env.ChromeMSVSProject('skia.vcproj', 462 p = env.ChromeMSVSProject('skia.vcproj',
463 guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}', 463 guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}',
464 files=input_files, 464 files=input_files,
465 relative_path_prefix=r'./', 465 relative_path_prefix=r'./',
466 tools = [ 466 tools = [
467 'VCPreBuildEventTool', 467 'VCPreBuildEventTool',
468 'VCCustomBuildTool', 468 'VCCustomBuildTool',
469 'VCXMLDataGeneratorTool', 469 'VCXMLDataGeneratorTool',
470 'VCWebServiceProxyGeneratorTool', 470 'VCWebServiceProxyGeneratorTool',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 ExcludedFromBuild='true', 509 ExcludedFromBuild='true',
510 tools=[ 510 tools=[
511 MSVSTool('VCCLCompilerTool'), 511 MSVSTool('VCCLCompilerTool'),
512 ]) 512 ])
513 513
514 env.AlwaysBuild(p) 514 env.AlwaysBuild(p)
515 515
516 i = env.Command('$CHROME_SRC_DIR/skia/skia.vcproj', p, 516 i = env.Command('$CHROME_SRC_DIR/skia/skia.vcproj', p,
517 Copy('$TARGET', '$SOURCE')) 517 Copy('$TARGET', '$SOURCE'))
518 Alias('msvs', i) 518 Alias('msvs', i)
OLDNEW
« no previous file with comments | « sdch/SConscript ('k') | testing/SConscript.gtest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698