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 /chrome/SConscript | |
| 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 'chrome/SConscript')
| -rw-r--r-- | chrome/SConscript | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 52b4a17..fb1663c 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -35,8 +35,6 @@ env_res = env.Clone() env_test = env.Clone()
env = env.Clone()
-
-
install_targets = []
@@ -94,6 +92,9 @@ env_dll.Prepend( 'LIBXSLT_STATIC',
'LIBXML_STATIC',
'_WINDLL',
+ 'BROWSER_DLL',
+ 'RENDERER_DLL',
+ 'PLUGIN_DLL',
],
CCFLAGS = [
'/TP',
@@ -177,7 +178,7 @@ env_dll.Append( )
input_files = [
- 'app/chrome_main.cc',
+ 'app/chrome_dll_main.cc',
]
@@ -352,7 +353,7 @@ chrome_exe = env_exe.Program( [
env_res.RES('app/chrome_exe.rc'),
'app/breakpad.cc',
- 'app/main.cc',
+ 'app/chrome_exe_main.cc',
'app/google_update_client.cc',
'app/google_update_settings.cc',
@@ -385,8 +386,6 @@ env_snapshot.Prepend( CPPPATH = [
'$V8_DIR/src',
'$V8_DIR/src/pcre/jscre',
- #"C:\src\trunk-vs\chrome\\third_party\webkit\src\JavaScriptCore\os-win32"
- #"C:\src\trunk-vs\chrome\Debug\obj\snapshotv8\DerivedSources"
'..',
],
CPPDEFINES = [
|