Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: net/crash_cache.scons

Issue 11478: Finish replicating the *.vsprops structure. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/tools/test/image_diff/image_diff.scons ('k') | net/net_lib.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/crash_cache.scons
===================================================================
--- net/crash_cache.scons (revision 5681)
+++ net/crash_cache.scons (working copy)
@@ -10,43 +10,18 @@
env = env.Clone()
-env.SConscript([
- # On Linux, dependencies must follow dependents, so...
- # 1) net must come before base and modp_b64.
- '$NET_DIR/using_net.scons',
-
+env.ApplySConscript([
'$BASE_DIR/using_base.scons',
'$GTEST_DIR/../using_gtest.scons',
'$ICU38_DIR/using_icu38.scons',
-], {'env':env})
+ '$NET_DIR/using_net.scons',
+])
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
if env['PLATFORM'] == 'win32':
env.Prepend(
CCFLAGS = [
- '/TP',
'/WX',
],
- CPPDEFINES = [
- '_WIN32_WINNT=0x0600',
- 'WINVER=0x0600',
- '_HAS_EXCEPTIONS=0',
- ],
- LINKFLAGS = [
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/MACHINE:X86',
- '/FIXED:No',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
)
input_files = [
« no previous file with comments | « chrome/tools/test/image_diff/image_diff.scons ('k') | net/net_lib.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698