mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 05:10:49 +00:00
879065de9d
This patch moves the logic for selecting MOZ_WINCONSOLE out of individual Makefile.in files and into configure. It also changes config.mk to only pass -SUBSYSTEM:CONSOLE if MOZ_WINCONSOLE=1. The MSDN docs state that in the absence of -SUBSYSTEM, the linker will select the proper subsystem based on whether the program contains [w]main or [w]WinMain, so let it do that. One program (windbgdlg) needed a tweak to add a wmain for when MOZ_WINCONSOLE is defined. This patch leaves one instance in security/sandbox/win/wow_helper/Makefile.in, that Makefile has its own separate bug. --HG-- extra : commitid : 8acDjmfKivj extra : rebase_source : 03b4fa4c8ae077a894b08f3762ef93541e34ac1a
68 lines
2.5 KiB
Makefile
68 lines
2.5 KiB
Makefile
# vim:set ts=8 sw=8 sts=8 et:
|
|
# 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/.
|
|
|
|
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
|
|
|
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
TK_LIBS := -framework Cocoa $(TK_LIBS)
|
|
endif
|
|
|
|
# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
|
|
# shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
|
|
NSDISTMODE = copy
|
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
DEFINES += -DXULRUNNER_ICO='"$(DIST)/branding/xulrunner.ico"' -DDOCUMENT_ICO='"$(DIST)/branding/document.ico"'
|
|
|
|
ifdef MOZ_WIDGET_GTK
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
|
|
endif
|
|
|
|
# XXX applications would need to supply this file
|
|
#export:: brand.dtd.in
|
|
# $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $^ -o brand.dtd)
|
|
|
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
|
|
FRAMEWORK_NAME = XUL
|
|
FRAMEWORK_VERSION = $(MOZILLA_VERSION)
|
|
|
|
FRAMEWORK_DIR = \
|
|
$(DIST)/$(FRAMEWORK_NAME).framework/Versions/$(FRAMEWORK_VERSION)
|
|
|
|
$(FRAMEWORK_DIR)/Resources:
|
|
$(NSINSTALL) -D $@
|
|
|
|
tools:: $(PROGRAM) $(FRAMEWORK_DIR)/Resources
|
|
$(NSINSTALL) $(srcdir)/macbuild/InfoPlist.strings $(FRAMEWORK_DIR)/Resources
|
|
sed -e 's/APP_VERSION/$(APP_VERSION)/' $(srcdir)/macbuild/Info.plist.in > $(FRAMEWORK_DIR)/Info.plist
|
|
rsync -av $(DIST)/bin/ $(FRAMEWORK_DIR) --exclude mangle --exclude shlibsign
|
|
rm -f $(DIST)/$(FRAMEWORK_NAME).framework/Versions/Current \
|
|
$(DIST)/$(FRAMEWORK_NAME).framework/libxpcom.dylib \
|
|
$(DIST)/$(FRAMEWORK_NAME).framework/XUL \
|
|
$(DIST)/$(FRAMEWORK_NAME).framework/xulrunner
|
|
ln -s $(FRAMEWORK_VERSION) $(DIST)/$(FRAMEWORK_NAME).framework/Versions/Current
|
|
ln -s Versions/Current/libxpcom.dylib $(DIST)/$(FRAMEWORK_NAME).framework/libxpcom.dylib
|
|
ln -s Versions/Current/XUL $(DIST)/$(FRAMEWORK_NAME).framework/XUL
|
|
ln -s Versions/Current/xulrunner $(DIST)/$(FRAMEWORK_NAME).framework/xulrunner
|
|
|
|
clean clobber::
|
|
rm -rf $(DIST)/$(FRAMEWORK_NAME).framework
|
|
endif
|
|
|
|
README_FILE = $(srcdir)/../README.xulrunner
|
|
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(README_FILE) $(DIST)/bin
|
|
$(INSTALL) $(IFLAGS1) $(topsrcdir)/LICENSE $(DIST)/bin
|
|
$(INSTALL) $(IFLAGS1) $(srcdir)/install_app.py $(DIST)/bin
|
|
|