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

Unified Diff: net/net_unittests.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 | « net/net_resources.scons ('k') | net/stress_cache.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net_unittests.scons
===================================================================
--- net/net_unittests.scons (revision 5681)
+++ net/net_unittests.scons (working copy)
@@ -10,7 +10,7 @@
env = env.Clone()
-env.SConscript([
+env.ApplySConscript([
'$BASE_DIR/using_base.scons',
'$BZIP2_DIR/using_bzip2.scons',
'$CHROME_SRC_DIR/build/using_googleurl.scons',
@@ -20,41 +20,18 @@
'$NET_DIR/using_net.scons',
'$SDCH_DIR/using_sdch.scons',
'$ZLIB_DIR/using_zlib.scons',
-], {'env':env})
+])
if env['PLATFORM'] in ('posix', 'darwin'):
env.SConscript([
'$LIBEVENT_DIR/using_libevent.scons',
], {'env':env})
-
-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 | « net/net_resources.scons ('k') | net/stress_cache.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698