diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 20:01:24 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 20:01:24 +0000 |
| commit | 777c7bff9d40214069752a8ca91ade106a60536b (patch) | |
| tree | 79bb2ed5b72f896eb32564c35e983e994ed913ea /gears/SConscript.libjpeg | |
| parent | df06096817e6fc5a4a3e53b863cd4c439271ba45 (diff) | |
| download | chromium_src-777c7bff9d40214069752a8ca91ade106a60536b.zip chromium_src-777c7bff9d40214069752a8ca91ade106a60536b.tar.gz chromium_src-777c7bff9d40214069752a8ca91ade106a60536b.tar.bz2 | |
Changes to make Gears build on linux.
Review URL: http://codereview.chromium.org/5023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.libjpeg')
| -rw-r--r-- | gears/SConscript.libjpeg | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gears/SConscript.libjpeg b/gears/SConscript.libjpeg index 5931eb6..ef7c6c7 100644 --- a/gears/SConscript.libjpeg +++ b/gears/SConscript.libjpeg @@ -17,10 +17,12 @@ env.Replace( ], ) -#env.Append( -# CPPDEFINES = [ -# ], -#) +if env['OS'] == 'linux': + env.Append( + CCFLAGS = [ + '-Wno-main', + ], + ) input_files = [ '$LIBJPEG_DIR/jcapimin.c', @@ -71,4 +73,4 @@ input_files = [ '$LIBJPEG_DIR/jmemnobs.c', ] -env.ChromeStaticLibrary('jpeg', input_files) +env.ChromeStaticLibrary('jpeg-gears', input_files) |