Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-06-24 11:13:09 +08:00
commit 20c6498ca1
395 changed files with 818 additions and 23422 deletions

View file

@ -16,9 +16,6 @@ SOURCES += [
'nsXULStub.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
FINAL_TARGET = 'dist/XUL.framework/Versions/%(MOZILLA_VERSION)s' % CONFIG
DEFINES['XPCOM_GLUE'] = True
LOCAL_INCLUDES += [
@ -44,7 +41,3 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
DISABLE_STL_WRAPPING = True
# Need to link with CoreFoundation on Mac
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
OS_LIBS += CONFIG['TK_LIBS']