fixes bug 332088 "Updater should use static libs on Windows" patch by Regis Caspar <regis.caspar+bz@gmail.com>, r=bsmedberg
git-svn-id: svn://10.0.0.236/trunk@194475 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
399f898b74
commit
cfdeebb630
@ -46,6 +46,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = libbz2
|
||||
LIBRARY_NAME = bz2
|
||||
FORCE_STATIC_LIB= 1
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
endif
|
||||
|
||||
# This is defined by the bzip2-1.0.3 Makefile. It appears to be used to
|
||||
# configure GLIBC to support large files. This isn't something we care about
|
||||
|
||||
@ -47,6 +47,9 @@ MODULE = libmar
|
||||
LIBRARY_NAME = mar
|
||||
HOST_LIBRARY_NAME = hostmar
|
||||
FORCE_STATIC_LIB = 1
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
endif
|
||||
|
||||
# This makefile just builds support for reading archives.
|
||||
|
||||
|
||||
@ -44,6 +44,9 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = mar
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
endif
|
||||
|
||||
# The mar executable is output into dist/host/bin since it is something that
|
||||
# would only be used by our build system and should not itself be included in a
|
||||
|
||||
@ -60,6 +60,7 @@ LIBS += \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
USE_STATIC_LIBS = 1
|
||||
HAVE_PROGRESSUI = 1
|
||||
RCINCLUDE = updater.rc
|
||||
CPPSRCS += progressui_win.cpp
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user