diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 21:45:48 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-01 21:45:48 +0000 |
| commit | 1f9431546f1bafcbe8d5e0127ab8861413487174 (patch) | |
| tree | 57e37254dede512fd076845448f0c72bb0f81291 /build | |
| parent | 1ec8244f26aba55652a5ecf660df82563ba8f6bb (diff) | |
| download | chromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.zip chromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.tar.gz chromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.tar.bz2 | |
SCons build:
* Add base\object{,_watcher}.cc.
* Add chrome\browser\bookmark_{codec,storage}.cc.
* Add chrome\views\frame\browser_window_factory.cc.
* Split of app\main.cc into app\chrome_{dll,exe}_main.cc, with added CPPDEFINES for {BROWSER,RENDERER,PLUGIN}_DLL.
* Move $CSCRIPT, $PLATFORMSDK* and $VISUAL_STUDIO variables to the win32-specific construction environment.
* Remove unnecessary comments.
TBR: bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 484d820..92f93f6 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -53,12 +53,6 @@ env = Environment( TARGET_ROOT = '#/$BUILD_TYPE', OBJ_ROOT = '$TARGET_ROOT', - CSCRIPT = 'c:\\Windows\\System32\\cscript', - - PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', - PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL', - VISUAL_STUDIO = '/Program Files/Microsoft Visual Studio 8', - BASE_DIR = '#/$BUILD_TYPE/base', BREAKPAD_DIR = '#/$BUILD_TYPE/breakpad', CHROME_DIR = '#/$BUILD_TYPE/chrome', @@ -110,6 +104,12 @@ if env['PLATFORM'] == 'win32': msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] env.Replace( + CSCRIPT = 'c:\\Windows\\System32\\cscript', + + PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', + PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL', + VISUAL_STUDIO = '/Program Files/Microsoft Visual Studio 8', + CYGWIN_DIR = Dir('#../third_party/cygwin'), CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', |