| 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 os | 5 import os |
| 6 | 6 |
| 7 Import(['env']) | 7 Import(['env']) |
| 8 | 8 |
| 9 env = env.Clone() | 9 env = env.Clone() |
| 10 env_res = env.Clone() | 10 env_res = env.Clone() |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 'activex_shim/SConscript', | 233 'activex_shim/SConscript', |
| 234 'activex_shim_dll/SConscript', | 234 'activex_shim_dll/SConscript', |
| 235 ]) | 235 ]) |
| 236 | 236 |
| 237 env.Append( | 237 env.Append( |
| 238 CPPDEFINES = [ | 238 CPPDEFINES = [ |
| 239 '_CRT_SECURE_NO_DEPRECATE', | 239 '_CRT_SECURE_NO_DEPRECATE', |
| 240 '_CRT_NONSTDC_NO_WARNINGS', | 240 '_CRT_NONSTDC_NO_WARNINGS', |
| 241 '_CRT_NONSTDC_NO_DEPRECATE', | 241 '_CRT_NONSTDC_NO_DEPRECATE', |
| 242 ['CRASH', '__debugbreak'], | 242 ['CRASH', '__debugbreak'], |
| 243 '_WIN32_WINNT=0x0600', | |
| 244 'WINVER=0x0600', | |
| 245 ]) | 243 ]) |
| 246 | 244 |
| 247 env.Prepend( | 245 env.Prepend( |
| 248 CPPPATH = [ | 246 CPPPATH = [ |
| 249 '$WEBKIT_DIR/port/$JAVASCRIPTCORE_PLATFORM_SUBDIR', | 247 '$WEBKIT_DIR/port/$JAVASCRIPTCORE_PLATFORM_SUBDIR', |
| 250 '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/$JAVASCRIPTCORE_PLATFORM_SUBDIR', | 248 '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/$JAVASCRIPTCORE_PLATFORM_SUBDIR', |
| 251 ]) | 249 ]) |
| 252 else: | 250 else: |
| 253 env.Prepend( | 251 env.Prepend( |
| 254 CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'], | 252 CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'], |
| (...skipping 13 matching lines...) Expand all Loading... |
| 268 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll']) | 266 #env.Alias('webkit', ['.', '$DESTINATION_ROOT/icudt38.dll']) |
| 269 if env['PLATFORM'] == 'win32': | 267 if env['PLATFORM'] == 'win32': |
| 270 env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll']) | 268 env.Alias('webkit', ['$DESTINATION_ROOT/icudt38.dll']) |
| 271 | 269 |
| 272 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', | 270 version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', |
| 273 ['$WEBCORE_DIR/Configurations/Version.xcconfig', | 271 ['$WEBCORE_DIR/Configurations/Version.xcconfig', |
| 274 '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], | 272 '$CHROME_SRC_DIR/webkit/build/webkit_version.py'], |
| 275 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") | 273 "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") |
| 276 env.AlwaysBuild(version) | 274 env.AlwaysBuild(version) |
| 277 | 275 |
| OLD | NEW |