diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 23:30:01 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-07 23:30:01 +0000 |
| commit | 61d362a02f5f7b6afe23dea1b66f4125f395ef24 (patch) | |
| tree | 0d6f064486596713851dff6dd02d62389867832a /gears/SConscript | |
| parent | fadac4f5a545765c52fb0a22ad9c70e3a62cdfe3 (diff) | |
| download | chromium_src-61d362a02f5f7b6afe23dea1b66f4125f395ef24.zip chromium_src-61d362a02f5f7b6afe23dea1b66f4125f395ef24.tar.gz chromium_src-61d362a02f5f7b6afe23dea1b66f4125f395ef24.tar.bz2 | |
Update Gears to r3147, and fix scons build to match.
- media module removed
- pulseaudio removed
- sqlite, libpng, other libs updated
- minor files added
Review URL: http://codereview.chromium.org/16586
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript')
| -rw-r--r-- | gears/SConscript | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gears/SConscript b/gears/SConscript index 8c1d4b9..345c5c1 100644 --- a/gears/SConscript +++ b/gears/SConscript @@ -96,8 +96,8 @@ env.Replace( env.Replace( MAJOR = '0', MINOR = '5', - BUILD = '2', - PATCH = '6', + BUILD = '7', + PATCH = '0', VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}', FRIENDLY_NAME = 'Google Gears', @@ -350,8 +350,14 @@ if env['OFFICIAL_BUILD']: M4FLAGS = '-DOFFICIAL_BUILD=1', ) -# TODO: if USING_PNG -env.Append(CPPDEFINES = 'PNG_USER_CONFIG') +# TODO: if USING_LIBPNG +env.Append( + CPPDEFINES = [ + 'PNG_USER_CONFIG', + 'CHROME_PNG_WRITE_SUPPORT', + 'GEARS_PNG_BUILD', + ] +) # TODO: if USING_ZLIB env.Append( CPPDEFINES = [ @@ -639,9 +645,6 @@ elif env['OS'] == 'linux': '-shared', '-Wl,--version-script', '-Wl,$OPEN_DIR/tools/xpcom-ld-script', -# for PortAudio: need pthread and math - '-lpthread', - '-lm', # Additions to compile on hardy '-m32', ], @@ -745,13 +748,6 @@ elif env['OS'] == 'osx': '-DGEARS_TOOLS_DIR="$MAIN_DIR/$PRIVATE_DIR/tools"', ], ) - if not env['OFFICIAL_BUILD']: - # For PortAudio: - env.Append(FRAMEWORKS = [ - 'CoreAudio', - 'AudioToolbox', - 'AudioUnit', - ]) if env['MODE'] == 'dbg': env.Append( CPPFLAGS = [ @@ -930,7 +926,6 @@ sconscripts = [ 'SConscript.zlib', 'SConscript.libbreakpad_osx', 'SConscript.libgd', - 'SConscript.portaudio', ] for each in sconscripts: |