diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 18:49:49 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 18:49:49 +0000 |
| commit | 8f643b7837cee97b2be71efd0e206568d922d291 (patch) | |
| tree | b7b3ecacd650d8e31f1230af7c8a1f9625edd6dc /gears/SConscript | |
| parent | fed158a8addc9742511d2ce8925a9c29e94c003d (diff) | |
| download | chromium_src-8f643b7837cee97b2be71efd0e206568d922d291.zip chromium_src-8f643b7837cee97b2be71efd0e206568d922d291.tar.gz chromium_src-8f643b7837cee97b2be71efd0e206568d922d291.tar.bz2 | |
Gears SConscript now build vista_broker and crash_sender.
Review URL: http://codereview.chromium.org/7393
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript')
| -rw-r--r-- | gears/SConscript | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gears/SConscript b/gears/SConscript index 9b9c562..fd96489 100644 --- a/gears/SConscript +++ b/gears/SConscript @@ -242,6 +242,7 @@ env.Replace( CCFLAGS = [], CPPDEFINES = [], LIBS = [], + ARFLAGS = [], LINKFLAGS = [], ) @@ -360,11 +361,15 @@ if env['OS'] in ['win32', 'wince']: # Do not export UTF functions. 'U_STATIC_IMPLEMENTATION', ], +# Static lib flags. + ARFLAGS = [ + '/NOLOGO', + ], +# Shared lib and exe flags. LINKFLAGS = [ '/NOLOGO', '/DEBUG', '/RELEASE', - '/PDB:${TARGET.base}.pdb', # Set the preferred base address. This value was chosen because (a) it's near # the top of the valid address range, and (b) it doesn't conflict with other @@ -379,6 +384,7 @@ if env['OS'] in ['win32', 'wince']: '/W3', '/WX', '/GR-', + '/Fd"${TARGET.base}.pdb"', ], CXXFLAGS = [ '/TP', @@ -413,6 +419,9 @@ if env['OS'] in ['win32', 'wince']: 'BREAKPAD_AVOID_STREAMS', 'XP_WIN', ], + ARFLAGS = [ + '/MACHINE:X86', + ], LINKFLAGS = [ '/MACHINE:X86', '/NODEFAULTLIB:msvcrt', @@ -455,6 +464,9 @@ if env['OS'] in ['win32', 'wince']: '_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA', '_CE_CRT_ALLOW_WIN_MINMAX', ], + ARFLAGS = [ + '/MACHINE:THUMB', + ], LINKFLAGS = [ '/MACHINE:THUMB', '/NODEFAULTLIB:secchk.lib', |