diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 00:35:36 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 00:35:36 +0000 |
commit | 2fd6c6d0ffca6993559b5aac0b3dde8a75c3d338 (patch) | |
tree | 8a342eb6791af7f9b12bdc784d87d8380d985869 /base/gfx/base_gfx.scons | |
parent | 32670b07a6c42634f446e3d471f42a9fb40090f2 (diff) | |
download | chromium_src-2fd6c6d0ffca6993559b5aac0b3dde8a75c3d338.zip chromium_src-2fd6c6d0ffca6993559b5aac0b3dde8a75c3d338.tar.gz chromium_src-2fd6c6d0ffca6993559b5aac0b3dde8a75c3d338.tar.bz2 |
Start stitching GYP-generated files into the Linux build:
* Add a GYP=1 command-line variable to use the gyp-generated files
(which are generated side-by-side until everything's okay enough
to cut over for real).
* Rearrange existing *.scons files to match the layout of the
gyp-generated ones, so the transition will be easier:
* base.scons (the wrapping logic that calls the other *.scons files)
=> base_sln.scons
* base_lib.scons (the library itself)
=> base.scons (matching the gyp target generation)
* gfx/base_gfx.scons
=> base_gfx.scons (with necessary prepending of "gfx/" to path names)
build/SConscript.main fixes:
* Use an internal ${_GYP} infix variable to select the right flavor
of *.scons file (multiple places)
* When building with GYP=1, only load the one component *_sln_gyp.scons
file, because gyp has already created it with knowledge of all the
right dependent *_gyp.scons files to load.
Linux gyp build fixes:
* Add -32 to $ASFLAGS for generating a 32-bit libicudata.a from the
now-checked in .s.
* Add -Wno-unused and -Wno-unused-function to skia.
Review URL: http://codereview.chromium.org/28207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/base_gfx.scons')
-rw-r--r-- | base/gfx/base_gfx.scons | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons deleted file mode 100644 index b5356ec..0000000 --- a/base/gfx/base_gfx.scons +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -__doc__ = """ -Configuration for building base_gfx.lib / libbase_gfx.a. -""" - -Import('env') - -env = env.Clone() - -env.ApplySConscript([ - '$ICU38_DIR/using_icu38.scons', - '$LIBJPEG_DIR/using_libjpeg.scons', - '$LIBPNG_DIR/using_libpng.scons', - '$SKIA_DIR/using_skia.scons', - '$ZLIB_DIR/using_zlib.scons', -]) - -if env.Bit('windows'): - env.Prepend( - CCFLAGS = [ - '/WX', - ], - ) - -input_files = ChromeFileList([ - 'jpeg_codec.cc', - 'jpeg_codec.h', - 'png_decoder.cc', - 'png_decoder.h', - 'png_encoder.cc', - 'png_encoder.h', - 'point.cc', - 'point.h', - 'rect.cc', - 'rect.h', - 'size.cc', - 'size.h', -]) - -if env.Bit('windows'): - input_files.Extend([ - 'native_theme.cc', - 'native_theme.h', - 'gdi_util.cc', - 'gdi_util.h', - ]) -elif env.Bit('linux'): - input_files.Extend([ - 'gtk_util.cc', - 'gtk_util.h', - ]) - -env.ChromeLibrary('base_gfx', input_files) - -p = env.ChromeMSVSProject('../build/base_gfx.vcproj', - dest='$CHROME_SRC_DIR/base/build/base_gfx.vcproj', - guid='{A508ADD3-CECE-4E0F-8448-2F5E454DF551}', - keyword='Win32Proj', - files=input_files, - tools=[ - 'VCPreBuildEventTool', - 'VCCustomBuildTool', - 'VCXMLDataGeneratorTool', - 'VCWebServiceProxyGeneratorTool', - 'VCMIDLTool', - 'VCCLCompilerTool', - 'VCManagedResourceCompilerTool', - 'VCResourceCompilerTool', - 'VCPreLinkEventTool', - 'VCLibrarianTool', - 'VCALinkTool', - 'VCXDCMakeTool', - 'VCBscMakeTool', - 'VCFxCopTool', - 'VCPostBuildEventTool', - ]) - -p.AddConfig('Debug|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/debug.vsprops', - './base_gfx.vsprops', - '../../skia/using_skia.vsprops', - ]) - -p.AddConfig('Release|Win32', - ConfigurationType = '4', - InheritedPropertySheets = [ - '$(SolutionDir)../build/release.vsprops', - './base_gfx.vsprops', - '../../skia/using_skia.vsprops', - ]) |