Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 4 | |
michael@0 | 5 | ifeq ($(OS_ARCH),WINNT) |
michael@0 | 6 | OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32 shlwapi) |
michael@0 | 7 | endif |
michael@0 | 8 | |
michael@0 | 9 | ifeq ($(OS_ARCH),WINNT) |
michael@0 | 10 | OS_LIBS += $(call EXPAND_LIBNAME,version) |
michael@0 | 11 | endif |
michael@0 | 12 | |
michael@0 | 13 | EXTRA_DSO_LDOPTS += \ |
michael@0 | 14 | $(XPCOM_GLUE_LDOPTS) \ |
michael@0 | 15 | $(MOZ_COMPONENT_LIBS) \ |
michael@0 | 16 | $(NULL) |
michael@0 | 17 | |
michael@0 | 18 | # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code) |
michael@0 | 19 | # GTK2: Need to link with glib for GNOME shell service |
michael@0 | 20 | ifneq (,$(filter cocoa gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT))) |
michael@0 | 21 | EXTRA_DSO_LDOPTS += \ |
michael@0 | 22 | $(TK_LIBS) \ |
michael@0 | 23 | $(NULL) |
michael@0 | 24 | endif |
michael@0 | 25 | |
michael@0 | 26 | include $(topsrcdir)/config/rules.mk |
michael@0 | 27 | |
michael@0 | 28 | # Ensure that we don't embed a manifest referencing the CRT. |
michael@0 | 29 | EMBED_MANIFEST_AT = |