OLD | NEW |
1 # Copyright 2008, Google Inc. | 1 # Copyright 2008, Google Inc. |
2 # All rights reserved. | 2 # All rights reserved. |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... |
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 | 29 |
30 # TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct | 30 # TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct |
31 Import('env') | 31 Import('env') |
32 | 32 |
33 env = env.Clone() | 33 env = env.Clone() |
34 | 34 |
| 35 if env.WantSystemLib('libjpeg'): |
| 36 Return() |
| 37 |
35 env.Prepend( | 38 env.Prepend( |
36 CPPPATH = [ | 39 CPPPATH = [ |
37 '$CHROME_SRC_DIR', | 40 '$CHROME_SRC_DIR', |
38 ], | 41 ], |
39 ) | 42 ) |
40 | 43 |
41 if env['PLATFORM'] == 'win32': | 44 if env['PLATFORM'] == 'win32': |
42 env.Append( | 45 env.Append( |
43 CCFLAGS = [ | 46 CCFLAGS = [ |
44 '/TC', | 47 '/TC', |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 'jidctfst.c', | 93 'jidctfst.c', |
91 'jidctint.c', | 94 'jidctint.c', |
92 'jmemmgr.c', | 95 'jmemmgr.c', |
93 'jmemnobs.c', | 96 'jmemnobs.c', |
94 'jquant1.c', | 97 'jquant1.c', |
95 'jquant2.c', | 98 'jquant2.c', |
96 'jutils.c', | 99 'jutils.c', |
97 ] | 100 ] |
98 | 101 |
99 env.ChromeStaticLibrary('libjpeg', input_files) | 102 env.ChromeStaticLibrary('libjpeg', input_files) |
OLD | NEW |