diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-07-15 23:13:31 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-07-15 23:13:31 +0000 |
| commit | feafc2f129df921f9e2954f0a21b1060588e4a0f (patch) | |
| tree | 248d2f8df51e96c0d518ae5c782ad801ec53702f /toolkit/moz.configure | |
| parent | 84825468041d590ff8c660c42cf93b0d2243ad52 (diff) | |
| parent | c198ef11b9d2697501b3ea4cbcab98e4dad48a9d (diff) | |
| download | uxp-feafc2f129df921f9e2954f0a21b1060588e4a0f.tar.gz | |
Merge branch 'master' into releaseRELBASE_20210719RC_20210715
Diffstat (limited to 'toolkit/moz.configure')
| -rw-r--r-- | toolkit/moz.configure | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure index fbd728fdc8..4f4acdfd54 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -62,7 +62,7 @@ set_config('L10NBASEDIR', l10n_base) # reason. option('--enable-default-toolkit', nargs=1, choices=('cairo-windows', 'cairo-gtk2', 'cairo-gtk2-x11', 'cairo-gtk3', - 'cairo-cocoa', 'cairo-uikit'), + 'cairo-uikit'), help='Select default toolkit') @depends('--enable-default-toolkit', target) @@ -72,8 +72,6 @@ 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: @@ -196,7 +194,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', 'cocoa') and value.origin == 'default'): + if value or (toolkit in ('windows', 'gtk2', 'gtk3') and value.origin == 'default'): return True set_config('MOZ_INSTRUMENT_EVENT_LOOP', instrument_event_loop) @@ -282,7 +280,7 @@ add_old_configure_assignment('FT2_CFLAGS', # ============================================================== @depends(toolkit) def applemedia(toolkit): - if toolkit in ('cocoa', 'uikit'): + if toolkit in ('uikit'): return True set_config('MOZ_APPLEMEDIA', applemedia) |