diff options
Diffstat (limited to 'toolkit/moz.configure')
| -rw-r--r-- | toolkit/moz.configure | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index e3d3eca63d..643b4fbe34 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -48,7 +48,7 @@ set_config('L10NBASEDIR', l10n_base) # reason. option('--enable-default-toolkit', nargs=1, choices=('cairo-windows', 'cairo-gtk2', 'cairo-gtk2-x11', 'cairo-gtk3', - 'cairo-uikit'), + 'cairo-cocoa', 'cairo-uikit'), help='Select default toolkit') @depends('--enable-default-toolkit', target) @@ -58,6 +58,8 @@ def toolkit(value, target): os = target.os if target.os == 'WINNT': platform_choices = ('cairo-windows',) + elif target.os == 'OSX': + platform_choices = ('cairo-cocoa',) elif target.os == 'iOS': platform_choices = ('cairo-uikit',) else: @@ -180,7 +182,7 @@ option(env='MOZ_INSTRUMENT_EVENT_LOOP', @depends('MOZ_INSTRUMENT_EVENT_LOOP', toolkit) def instrument_event_loop(value, toolkit): - if value or (toolkit in ('windows', 'gtk2', 'gtk3') and value.origin == 'default'): + if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa') and value.origin == 'default'): return True set_config('MOZ_INSTRUMENT_EVENT_LOOP', instrument_event_loop) @@ -266,7 +268,7 @@ add_old_configure_assignment('FT2_CFLAGS', # ============================================================== @depends(toolkit) def applemedia(toolkit): - if toolkit in ('uikit'): + if toolkit in ('cocoa', 'uikit'): return True set_config('MOZ_APPLEMEDIA', applemedia) |