diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
| commit | 42f8488a5f66d7c1e5324bd1755d7f693b16ee97 (patch) | |
| tree | 54c7d2a62c4ea34b1250b5362c8e6f89d03f1a02 /build | |
| parent | 681c39a0ecc84fc918b2bec72cc69ad27d39903a (diff) | |
| parent | 6c3f95480a191ce432ddfb2aa400a6d70c4884a8 (diff) | |
| download | UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.gz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.lz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.tar.xz UXP-42f8488a5f66d7c1e5324bd1755d7f693b16ee97.zip | |
Merge branch 'master' into Basilisk-releasev2018.04.26
Diffstat (limited to 'build')
| -rw-r--r-- | build/application.ini | 8 | ||||
| -rw-r--r-- | build/moz.build | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/build/application.ini b/build/application.ini index e60f86b69..8f65421ed 100644 --- a/build/application.ini +++ b/build/application.ini @@ -19,11 +19,17 @@ #include @TOPOBJDIR@/source-repo.h [App] #ifdef MC_OFFICIAL +#if defined(MC_PALEMOON) || defined(MC_BASILISK) Vendor=Moonchild Productions +#elif defined(BINOC_BOREALIS) +Vendor=Binary Outcast #else Vendor=@MOZ_APP_VENDOR@ #endif -#if defined(MOZ_PHOENIX) && defined(MC_PALEMOON) +#else +Vendor=@MOZ_APP_VENDOR@ +#endif +#ifdef MC_PALEMOON Name=Pale Moon #else Name=@MOZ_APP_BASENAME@ diff --git a/build/moz.build b/build/moz.build index f25e5cfa5..d96724cad 100644 --- a/build/moz.build +++ b/build/moz.build @@ -30,8 +30,8 @@ if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_PHOENIX'] = CONFIG['MOZ_PHOENIX'] DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True -if CONFIG['MC_OFFICAL']: - DEFINES['MC_OFFICAL'] = CONFIG['MC_OFFICAL'] +if CONFIG['MC_OFFICIAL']: + DEFINES['MC_OFFICIAL'] = CONFIG['MC_OFFICIAL'] if CONFIG['MC_BASILISK']: DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK'] @@ -39,6 +39,9 @@ if CONFIG['MC_BASILISK']: if CONFIG['MC_PALEMOON']: DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON'] +if CONFIG['BINOC_BOREALIS']: + DEFINES['BINOC_BOREALIS'] = CONFIG['BINOC_BOREALIS'] + if CONFIG['MOZ_APP_PROFILE']: DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE'] |