diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 23:55:17 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 23:55:17 +0000 |
| commit | 5affc15f3a8a51f42debbf37806087dfbc84818f (patch) | |
| tree | 3026d88cfe779989c9437bd01acb21042538b13c /gears/SConscript | |
| parent | e8d2a6a661bdcb16dad07df9159bb29bed84c8d1 (diff) | |
| download | chromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.zip chromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.tar.gz chromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.tar.bz2 | |
Update Gears to pull in latest revision from svn.
Fix scons breakage in the wince Gears port.
Review URL: http://codereview.chromium.org/8776
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript')
| -rw-r--r-- | gears/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gears/SConscript b/gears/SConscript index f24eed3..26e3603 100644 --- a/gears/SConscript +++ b/gears/SConscript @@ -252,6 +252,7 @@ env.Replace( # current build as closely as possible until we switch everyone to SCons, then # gradually integrate. env.Replace( + ARFLAGS = [], CPPPATH = [ '$OPEN_DIR', '$OPEN_DIR/..', @@ -276,8 +277,10 @@ env.Replace( FRAMEWORKPATH = [], FRAMEWORKS = [], LIBS = [], + LIBPATH = ['$COMPONENT_LIBRARY_DIR'], LINKFLAGS = [], SHLINKFLAGS = [], + COMPONENT_LIBRARY_DIR = '$COMMON_OUTDIR/lib', ) if env['MODE'] == 'dbg': @@ -493,7 +496,7 @@ if env['OS'] in ['win32', 'wince']: '_WIN32_WCE=0x501', 'WINVER=_WIN32_WCE', 'UNDER_CE=0x501', - 'WINCE', + 'OS_WINCE', 'WIN32_PLATFORM_PSPC', 'ARM', '_ARM_', |