mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 535369 - Backed out changeset 20d2d6abd4a2, will wait for tree to stabilize
This commit is contained in:
parent
e6131b512a
commit
f0d6758d41
@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = libbz2
|
||||
LIBRARY_NAME = bz2
|
||||
HOST_LIBRARY_NAME = hostbz2
|
||||
FORCE_STATIC_LIB= 1
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
@ -67,21 +66,8 @@ CSRCS = \
|
||||
randtable.c \
|
||||
$(NULL)
|
||||
|
||||
HOST_CSRCS = $(CSRCS)
|
||||
|
||||
EXPORTS = \
|
||||
bzlib.h \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef CROSS_COMPILE
|
||||
ifdef HOST_NSPR_MDCPUCFG
|
||||
HOST_CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
|
||||
endif
|
||||
endif
|
||||
|
||||
# The intermediate (.ii/.s) files for host and target can have the same name...
|
||||
# disable parallel builds
|
||||
.NOTPARALLEL:
|
||||
|
||||
|
@ -47,14 +47,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
# build system and is not intended to be included in Mozilla distributions.
|
||||
HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
|
||||
HOST_CSRCS = bsdiff.c
|
||||
|
||||
ifdef CROSS_COMPILE
|
||||
HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
|
||||
else
|
||||
HOST_LIBS += $(BZ2_LIBS)
|
||||
endif
|
||||
|
||||
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
|
||||
endif
|
||||
|
||||
|
@ -68,7 +68,6 @@ ifndef MOZ_NATIVE_BZ2
|
||||
tier_external_dirs += modules/libbz2
|
||||
endif
|
||||
tier_external_dirs += modules/libmar
|
||||
tier_external_dirs += other-licenses/bsdiff
|
||||
endif
|
||||
|
||||
tier_external_dirs += gfx/qcms
|
||||
|
Loading…
Reference in New Issue
Block a user