diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
| commit | 591ff8e63813bd4af50f4441d5bbc77c79d35dae (patch) | |
| tree | d60872a901ed822bfff9d1b47621af13d4a395cc /browser/branding/official/moz.build | |
| parent | d2b88bf812a9f13ac02e5cd116ae19e34a198ada (diff) | |
| parent | b7852aab25b8ab06e0463bbe7c5d20cdd6f89750 (diff) | |
| download | UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.gz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.lz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.xz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.zip | |
Merge branch 'branding-work'
Diffstat (limited to 'browser/branding/official/moz.build')
| -rw-r--r-- | browser/branding/official/moz.build | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index 9045cee11..f1a839c9d 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,5 +9,53 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -include('../branding-common.mozbuild') -FirefoxBranding() +JS_PREFERENCE_FILES += [ + 'pref/firefox-branding.js', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + FINAL_TARGET_FILES['..'] += [ + 'basilisk.VisualElementsManifest.xml', + ] + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', + ] + BRANDING_FILES += [ + 'appname.bmp', + 'bgintro.bmp', + 'branding.nsi', + 'clock.bmp', + 'document.ico', + 'firefox.ico', + 'newtab.ico', + 'newwindow.ico', + 'particles.bmp', + 'pbmode.ico', + 'pencil-rtl.bmp', + 'pencil.bmp', + 'wizHeader.bmp', + 'wizHeaderRTL.bmp', + 'wizWatermark.bmp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + BRANDING_FILES += [ + 'background.png', + 'disk.icns', + 'document.icns', + 'dsstore', + 'firefox.icns', + ] +elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + BRANDING_FILES += [ + 'default16.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] |