diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 18:25:48 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 18:25:48 +0000 |
| commit | 3c57ca05f196e998f2440e49cc5bf44969b12c37 (patch) | |
| tree | f375d4e29c8fb82b85b44f3c9a67861691bc0299 /sdch/SConscript | |
| parent | 2e484a5a3a2c597b67bdfbfaf54d8c16bc9b270b (diff) | |
| download | chromium_src-3c57ca05f196e998f2440e49cc5bf44969b12c37.zip chromium_src-3c57ca05f196e998f2440e49cc5bf44969b12c37.tar.gz chromium_src-3c57ca05f196e998f2440e49cc5bf44969b12c37.tar.bz2 | |
Check in a generated config.h file for SDCH on Linux
(as was done for mac) and add the include directory
to the .gyp file.
Review URL: http://codereview.chromium.org/40101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sdch/SConscript')
| -rw-r--r-- | sdch/SConscript | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sdch/SConscript b/sdch/SConscript index 2c5f9ec..38455e0 100644 --- a/sdch/SConscript +++ b/sdch/SConscript @@ -15,6 +15,9 @@ cpppath = [ if env.Bit('windows'): cpppath.append('$OPEN_VCDIFF_DIR/vsprojects') +if env.Bit('linux'): + cpppath.append('linux') + env.Prepend(CPPPATH = cpppath) input_files = ChromeFileList([ @@ -144,10 +147,14 @@ if env.Bit('posix'): # varlist['DEFINES'] below makes the target config.h file depend # on the list of definitions in the passed-in $DEFINES variable. - env.Command('$OPEN_VCDIFF_DIR/src/config.h', - '$OPEN_VCDIFF_DIR/src/config.h.in', - Action(AutoConfig, varlist=['DEFINES']), - DEFINES=defines) + # + # Comment this out so we use the checked-in config.h in the + # linux subdirectory, but leave it here in case we need + # to ressurect this. + #env.Command('$OPEN_VCDIFF_DIR/src/config.h', + # '$OPEN_VCDIFF_DIR/src/config.h.in', + # Action(AutoConfig, varlist=['DEFINES']), + # DEFINES=defines) p = env.ChromeMSVSProject('sdch.vcproj', |