mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 08:27:31 +09:00
Replace NSS with Pale Moon's
This commit is contained in:
parent
ff1e5e48bf
commit
8c2e376f94
2870 changed files with 1762232 additions and 1374220 deletions
|
|
@ -56,6 +56,8 @@ else
|
|||
_MSC_VER_GE_11 := $(shell expr $(_MSC_VER) \>= 1700)
|
||||
# VC12 (2013).
|
||||
_MSC_VER_GE_12 := $(shell expr $(_MSC_VER) \>= 1800)
|
||||
# VC14 (2015).
|
||||
_MSC_VER_GE_14 := $(shell expr $(_MSC_VER) \>= 1900)
|
||||
ifeq ($(_CC_VMAJOR),14)
|
||||
# -DYNAMICBASE is only supported on VC8SP1 or newer,
|
||||
# so be very specific here!
|
||||
|
|
@ -85,15 +87,7 @@ NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall
|
|||
endif
|
||||
NSINSTALL = nsinstall
|
||||
|
||||
MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend
|
||||
MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
|
||||
# Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute.
|
||||
# If it is absolute, gmake will crash unless the named file exists.
|
||||
MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk
|
||||
|
||||
INSTALL = $(NSINSTALL)
|
||||
MAKE_OBJDIR = mkdir
|
||||
MAKE_OBJDIR += $(OBJDIR)
|
||||
GARBAGE += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
|
||||
XP_DEFINE += -DXP_PC
|
||||
ifdef NS_USE_GCC
|
||||
|
|
@ -103,6 +97,10 @@ LIB_SUFFIX = lib
|
|||
endif
|
||||
DLL_SUFFIX = dll
|
||||
|
||||
define MAKE_OBJDIR
|
||||
if test ! -d $(@D); then mkdir -p $(@D); fi
|
||||
endef
|
||||
|
||||
ifdef NS_USE_GCC
|
||||
OS_CFLAGS += -mwindows
|
||||
_GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
|
||||
|
|
@ -185,6 +183,8 @@ endif
|
|||
endif
|
||||
# Purify requires /FIXED:NO when linking EXEs.
|
||||
LDFLAGS += /FIXED:NO
|
||||
# So the linker will find main in the gtestutil library
|
||||
LDFLAGS += -SUBSYSTEM:CONSOLE
|
||||
endif
|
||||
ifneq ($(_MSC_VER),$(_MSC_VER_6))
|
||||
# NSS has too many of these to fix, downgrade the warning
|
||||
|
|
@ -360,15 +360,6 @@ ifneq ($(CPU_ARCH),x386)
|
|||
CPU_TAG = _$(CPU_ARCH)
|
||||
endif
|
||||
|
||||
#
|
||||
# override ruleset.mk, removing the "lib" prefix for library names, and
|
||||
# adding the "32" after the LIBRARY_VERSION.
|
||||
#
|
||||
ifdef LIBRARY_NAME
|
||||
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
|
||||
IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
|
||||
endif
|
||||
|
||||
#
|
||||
# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue