| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 if env['PLATFORM'] == 'win32': | 9 if env.Bit('windows'): |
| 10 env.Append( | 10 env.Append( |
| 11 CCFLAGS = [ | 11 CCFLAGS = [ |
| 12 '/TP', | 12 '/TP', |
| 13 | 13 |
| 14 '/wd4138', | 14 '/wd4138', |
| 15 '/wd4244', | 15 '/wd4244', |
| 16 '/wd4291', | 16 '/wd4291', |
| 17 '/wd4305', | 17 '/wd4305', |
| 18 '/wd4521', | 18 '/wd4521', |
| 19 '/wd4099', | 19 '/wd4099', |
| 20 '/wd4800', | 20 '/wd4800', |
| 21 ], | 21 ], |
| 22 CPPDEFINES = [ | 22 CPPDEFINES = [ |
| 23 '__STD_C', | 23 '__STD_C', |
| 24 ], | 24 ], |
| 25 ) | 25 ) |
| 26 | 26 |
| 27 if env['PLATFORM'] in ('darwin', 'posix'): | 27 if env.Bit('posix'): |
| 28 if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']: | 28 if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']: |
| 29 # It'd be nice to fix these warnings upstream, but we're not going to | 29 # It'd be nice to fix these warnings upstream, but we're not going to |
| 30 # block on it. | 30 # block on it. |
| 31 env['CXXFLAGS'].remove('-Werror') | 31 env['CXXFLAGS'].remove('-Werror') |
| 32 | 32 |
| 33 env.Append( | 33 env.Append( |
| 34 CPPPATH = [ | 34 CPPPATH = [ |
| 35 '$THIRD_PARTY_DIR/sqlite' | 35 '$THIRD_PARTY_DIR/sqlite' |
| 36 ] | 36 ] |
| 37 ) | 37 ) |
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 '$WEBCORE_DIR/xml/XPathValue.cpp', | 797 '$WEBCORE_DIR/xml/XPathValue.cpp', |
| 798 '$WEBCORE_DIR/xml/XPathVariableReference.cpp', | 798 '$WEBCORE_DIR/xml/XPathVariableReference.cpp', |
| 799 '$WEBCORE_DIR/xml/XSLImportRule.cpp', | 799 '$WEBCORE_DIR/xml/XSLImportRule.cpp', |
| 800 '$WEBCORE_DIR/xml/XSLStyleSheet.cpp', | 800 '$WEBCORE_DIR/xml/XSLStyleSheet.cpp', |
| 801 '$WEBCORE_DIR/xml/XSLTExtensions.cpp', | 801 '$WEBCORE_DIR/xml/XSLTExtensions.cpp', |
| 802 '$WEBCORE_DIR/xml/XSLTProcessor.cpp', | 802 '$WEBCORE_DIR/xml/XSLTProcessor.cpp', |
| 803 '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp', | 803 '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp', |
| 804 ] | 804 ] |
| 805 | 805 |
| 806 # These files don't compile yet on linux or mac. | 806 # These files don't compile yet on linux or mac. |
| 807 if env['PLATFORM'] in ('darwin'): | 807 if env.Bit('mac'): |
| 808 remove_files = [ | 808 remove_files = [ |
| 809 # includes platform specific FontCustomPlatformData.h | 809 # includes platform specific FontCustomPlatformData.h |
| 810 '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', | 810 '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', |
| 811 '$WEBCORE_DIR/loader/CachedFont.cpp', | 811 '$WEBCORE_DIR/loader/CachedFont.cpp', |
| 812 ] | 812 ] |
| 813 for remove in remove_files: | 813 for remove in remove_files: |
| 814 input_files.remove(remove) | 814 input_files.remove(remove) |
| 815 | 815 |
| 816 # These files don't compile on the mac | 816 # These files don't compile on the mac |
| 817 if env['PLATFORM'] in ('darwin'): | 817 if env.Bit('mac'): |
| 818 remove_files = [ | 818 remove_files = [ |
| 819 # Missing WebCore::FrameView::printPanScrollIcon | 819 # Missing WebCore::FrameView::printPanScrollIcon |
| 820 '$WEBCORE_DIR/page/EventHandler.cpp', | 820 '$WEBCORE_DIR/page/EventHandler.cpp', |
| 821 ] | 821 ] |
| 822 for remove in remove_files: | 822 for remove in remove_files: |
| 823 input_files.remove(remove) | 823 input_files.remove(remove) |
| 824 | 824 |
| 825 # Precompiled headers only work under MSVC in scons. | 825 # Precompiled headers only work under MSVC in scons. |
| 826 if env['PLATFORM'] == 'win32': | 826 if env.Bit('windows'): |
| 827 env_p = env.Clone() | 827 env_p = env.Clone() |
| 828 env_p.Append(CCFLAGS='/Ylwebcore') | 828 env_p.Append(CCFLAGS='/Ylwebcore') |
| 829 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc') | 829 pch, obj = env_p.PCH('$OBJ_ROOT/webkit/build/precompiled_webkit.cc') |
| 830 env['PCH'] = pch | 830 env['PCH'] = pch |
| 831 env['PCHSTOP'] = 'precompiled_webkit.h' | 831 env['PCHSTOP'] = 'precompiled_webkit.h' |
| 832 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) | 832 env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) |
| 833 input_files += [obj] | 833 input_files += [obj] |
| 834 | 834 |
| 835 env.ChromeStaticLibrary('WebCore', input_files) | 835 env.ChromeStaticLibrary('WebCore', input_files) |
| 836 | 836 |
| OLD | NEW |