From f3f568b18078fa29f9b84cd66bd2d1029ce408a1 Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Wed, 19 Nov 2008 22:38:46 +0000 Subject: Some cleanup work I did while adding more Safari builders. It got to be extensive so I decided to just check it in. Changes: - Use Return() instead of Export() from SConscript.inputs to pass 'env' back. - Move some of the build vars around to fix builders that aren't in SConscript.browser. - Refactor SConscript.installers so that we now have DirBuilder, a generic builder that creates a directory tree (used to be FF-specific). This will be used for OSX bundles. Review URL: http://codereview.chromium.org/11261 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5722 0039d316-1c4b-4281-b951-d872f2087c98 --- gears/SConscript.browser | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gears/SConscript.browser') diff --git a/gears/SConscript.browser b/gears/SConscript.browser index 090bab7..1fa2400 100644 --- a/gears/SConscript.browser +++ b/gears/SConscript.browser @@ -188,9 +188,6 @@ env.Append( if env['OS'] == 'osx': env.Append( - LINKFLAGS = [ - '-bundle' - ], LIBS = [ 'mozjs-gears', 'curl', @@ -201,20 +198,7 @@ if env['OS'] == 'osx': LIBPATH = [ '$OPEN_DIR/tools/osx' ], - FRAMEWORKS = [ - 'Carbon', - 'CoreServices', - 'Cocoa', - 'WebKit', - ] ) - if not env['OFFICIAL_BUILD']: - # For PortAudio: - env.Append(FRAMEWORKS = [ - 'CoreAudio', - 'AudioToolbox', - 'AudioUnit', - ]) # Add in libraries for in-development APIs for non-official builds. if not env['OFFICIAL_BUILD']: @@ -392,9 +376,7 @@ if env['OS'] == 'win32': # env.SharedObject('$OPEN_DIR/base/safari/resource_archive.cc') # Include the input file list. -env.SConscript('SConscript.inputs', exports=['env', 'env_res']) -Import('env_inputs') -env = env_inputs +env = env.SConscript('SConscript.inputs', exports=['env', 'env_res']) #----------------------------------------------------------------------------- -- cgit v1.1