diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 20:23:01 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 20:23:01 +0000 |
| commit | d924c436f199eb90b3d5c10e8d5aedd991de4f1d (patch) | |
| tree | 7b5b127eca25377c5f0b1d2e1bd7e7b3367bed46 /gears/SConscript.inputs | |
| parent | 295659c7f84cc46843da8b602b60b682059237a1 (diff) | |
| download | chromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.zip chromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.tar.gz chromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.tar.bz2 | |
Fix SF, FF2, and FF3 builds on osx in gears-scons build. OFFICIAL_BUILD=0 now
works as well.
Review URL: http://codereview.chromium.org/10923
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.inputs')
| -rwxr-xr-x | gears/SConscript.inputs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gears/SConscript.inputs b/gears/SConscript.inputs index 09c78a6..ff5ff4b 100755 --- a/gears/SConscript.inputs +++ b/gears/SConscript.inputs @@ -258,7 +258,8 @@ if env['OS'] == 'osx': env.Append(BROWSER_CPPSRCS = [ '$OPEN_DIR/base/common/common_osx.mm', '$OPEN_DIR/base/safari/nsstring_utils.mm', - '$OPEN_DIR/base/common/user_config_osx.cc' + '$OPEN_DIR/base/common/user_config_osx.cc', + '$OPEN_DIR/notifier/notifier_process_osx.mm', ]) #----------------------------------------------------------------------------- @@ -293,6 +294,11 @@ env.Append(FF3_CPPSRCS = [ '$OPEN_DIR/base/firefox/xpcom_dynamic_load.cc', ]) +if env['OS'] == 'osx': + env.Append(FF3_CPPSRCS = [ + '$OPEN_DIR/base/common/ipc_message_queue_test_osx.mm', + ]) + #----------------------------------------------------------------------------- # base/ie @@ -406,7 +412,7 @@ env.Append(BROWSER_CPPSRCS = [ # canvas # The Canvas API is not yet enabled in official builds. -if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']: +if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']: env.Append(BROWSER_CPPSRCS = [ '$OPEN_DIR/canvas/blob_backed_skia_input_stream.cc', '$OPEN_DIR/canvas/blob_backed_skia_output_stream.cc', @@ -978,10 +984,13 @@ env.Append(COMMON_RESOURCES = [ #----------------------------------------------------------------------------- # libs +if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']: + env.Append( + LIBPATH = ['$THIRD_PARTY_DIR/skia'], + LIBS = ['${LIBPREFIX}skia-${MODE}-${OS}-${ARCH}${LIBSUFFIX}'], + ) + if env['OS'] == 'win32': - env.Append(BROWSER_LINKSRCS = [ - '$THIRD_PARTY_DIR/skia/skia-${MODE}-${OS}-${ARCH}.lib', - ]) env.Append(NPAPI_LINKSRCS = [ '$THIRD_PARTY_DIR/v8/bin-${MODE}/libv8core.lib', '$THIRD_PARTY_DIR/v8/bin-${MODE}/no_snapshotv8.lib', |