diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /browser/components/build/moz.build | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/components/build/moz.build')
| -rw-r--r-- | browser/components/build/moz.build | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build deleted file mode 100644 index 622cf449c..000000000 --- a/browser/components/build/moz.build +++ /dev/null @@ -1,42 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -EXPORTS += [ - 'nsBrowserCompsCID.h', -] - -SOURCES += [ - 'nsModule.cpp', -] - -XPCOMBinaryComponent('browsercomps') - -LOCAL_INCLUDES += [ - '../about', - '../dirprovider', - '../feeds', - '../migration', - '../shell', -] - -if CONFIG['OS_ARCH'] == 'WINNT': - OS_LIBS += [ - 'esent', - 'netapi32', - 'ole32', - 'shell32', - 'shlwapi', - 'version', - ] - DELAYLOAD_DLLS += [ - 'esent.dll', - 'netapi32.dll', - ] - -# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) -# GTK2: Need to link with glib for GNOME shell service -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'gtk2', 'gtk3'): - OS_LIBS += CONFIG['TK_LIBS'] |