зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1606274 - Remove always-true MOZ_PHOENIX macro. r=firefox-build-system-reviewers,rstewart
MOZ_PHOENIX was a macro added back in 2002 to differentiate SeaMonkey and Phoenix appshell bits. The earliest references to MOZ_PHOENIX I can find in Gecko's pre-hg history are bug 161448, bug 213228, bug 243091, and 05ef2e9b38
.
Differential Revision: https://phabricator.services.mozilla.com/D58358
--HG--
extra : moz-landing-system : lando
This commit is contained in:
Родитель
eb0f4adeb2
Коммит
1c077cf213
|
@ -69,7 +69,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
|
|||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
RCINCLUDE = 'splash.rc'
|
||||
DEFINES['MOZ_PHOENIX'] = True
|
||||
DIRS += [
|
||||
'winlauncher',
|
||||
]
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
MOZ_APP_BASENAME=Firefox
|
||||
MOZ_APP_VENDOR=Mozilla
|
||||
MOZ_UPDATER=1
|
||||
MOZ_PHOENIX=1
|
||||
|
||||
if test "$OS_ARCH" = "WINNT"; then
|
||||
if ! test "$HAVE_64BIT_BUILD"; then
|
||||
|
|
|
@ -1674,22 +1674,11 @@ if test -n "$WITH_APP_BASENAME" ; then
|
|||
MOZ_APP_BASENAME="$WITH_APP_BASENAME"
|
||||
fi
|
||||
|
||||
# Special cases where we need to AC_DEFINE something. Also a holdover for apps
|
||||
# that haven't made a confvars.sh yet. Don't add new stuff here, use
|
||||
# MOZ_BUILD_APP.
|
||||
case "$MOZ_BUILD_APP" in
|
||||
browser)
|
||||
AC_DEFINE(MOZ_PHOENIX)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Graphene is a desktop runtime for running applications with a HTML UI.
|
||||
if test -n "$MOZ_GRAPHENE"; then
|
||||
AC_DEFINE(MOZ_GRAPHENE)
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_PHOENIX)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Ensure Android SDK and build-tools versions depending on
|
||||
dnl mobile target.
|
||||
|
|
|
@ -13,17 +13,13 @@
|
|||
|
||||
// Constants identifying Win32 "native" resources.
|
||||
|
||||
#ifdef MOZ_PHOENIX
|
||||
|
||||
# define IDI_APPICON 1
|
||||
# define IDI_DOCUMENT 2
|
||||
# define IDI_NEWWINDOW 3
|
||||
# define IDI_NEWTAB 4
|
||||
# define IDI_PBMODE 5
|
||||
# ifndef IDI_APPLICATION
|
||||
# define IDI_APPLICATION 32512
|
||||
# endif
|
||||
|
||||
#define IDI_APPICON 1
|
||||
#define IDI_DOCUMENT 2
|
||||
#define IDI_NEWWINDOW 3
|
||||
#define IDI_NEWTAB 4
|
||||
#define IDI_PBMODE 5
|
||||
#ifndef IDI_APPLICATION
|
||||
# define IDI_APPLICATION 32512
|
||||
#endif
|
||||
|
||||
// String that goes in the WinXP Start Menu.
|
||||
|
|
Загрузка…
Ссылка в новой задаче