diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:00:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:00:46 +0000 |
| commit | 94f686369c158fe46a327849ccae9f31c423adef (patch) | |
| tree | 11a749e1cb4078790d6429e25a346a018cd03e1d /chrome/installer/util | |
| parent | b496c9e6770e4951eec84b17d5c84454815bf796 (diff) | |
| download | chromium_src-94f686369c158fe46a327849ccae9f31c423adef.zip chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.gz chromium_src-94f686369c158fe46a327849ccae9f31c423adef.tar.bz2 | |
More *.scons renaming:
* Rename SConscript to *.scons in the following directories:
third_party\{bspatch,bsdiff,lzma_dsk}
chrome\installer\{setup,mini_installer,util}
* Split mini_installer and installer_unittests into separate *.scons files.
* Add using_bspatch.scons and using_lzma_sdk.scons "properties" files,
modifying other *.scons files to use them as appropriate.
Review URL: http://codereview.chromium.org/10952
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/util.scons (renamed from chrome/installer/util/SConscript) | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/util.scons index cd1ae17..e1e4957 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/util.scons @@ -6,35 +6,24 @@ Import('env') env = env.Clone() +env.ApplySConscript([ + '$BREAKPAD_DIR/using_breakpad.scons', + '$CHROME_DIR/third_party/wtl/using_wtl.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBJPEG_DIR/using_libjpeg.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$LZMA_SDK_DIR/using_lzma_sdk.scons', + '$NPAPI_DIR/using_npapi.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) env.Prepend( CPPPATH = [ - '$LZMA_SDK_DIR', - '$CHROME_DIR/third_party/wtl/include', - '$NPAPI_DIR', - '$LIBXML_DIR/include', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBPNG_DIR', - '$ZLIB_DIR', - '$BREAKPAD_DIR/src', - '$LIBJPEG_DIR', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', '$CHROME_SRC_DIR', '.', ], - CPPDEFINES = [ - "_LZMA_IN_CB", - "LIBXML_STATIC", - "PNG_USER_CONFIG", - "CHROME_PNG_WRITE_SUPPORT" - "U_STATIC_IMPLEMENTATION", - ], - CCFLAGS = [ - '/TP', - ], ) input_files = [ @@ -61,7 +50,7 @@ input_files = [ 'work_item_list.cc', ] -x = env.ChromeStaticLibrary('util', input_files) +env.ChromeStaticLibrary('util', input_files) # create_string_rc.py imports FP.py from the tools/grit/grit/extern |