зеркало из https://github.com/mozilla/pjs.git
Added libsoftupdat.a to the link line when MOZ_SMARTUPDATE is defined. Made SmartUpdate independent of Java
This commit is contained in:
Родитель
1f9a764b70
Коммит
586094a130
|
@ -481,6 +481,12 @@ BASIC_LIBS += \
|
|||
$(DIST)/lib/libjbn.a \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_SMARTUPDATE
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \
|
||||
$(DIST)/lib/libprgrss.a \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjsl.a
|
||||
endif
|
||||
|
@ -506,7 +512,6 @@ ifdef NSJVM
|
|||
ifdef EDITOR
|
||||
BASIC_LIBS += $(DIST)/lib/libedtplug.a
|
||||
endif
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a
|
||||
else # !NSJVM
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libstubsj.a \
|
||||
|
|
|
@ -494,6 +494,12 @@ BASIC_LIBS += \
|
|||
$(DIST)/lib/libjbn.a \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_SMARTUPDATE
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \
|
||||
$(DIST)/lib/libprgrss.a \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjsl.a
|
||||
endif
|
||||
|
@ -519,7 +525,6 @@ ifdef NSJVM
|
|||
ifdef MOZ_EDITOR
|
||||
BASIC_LIBS += $(DIST)/lib/libedtplug.a
|
||||
endif
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a
|
||||
else # !NSJVM
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libstubsj.a \
|
||||
|
|
Загрузка…
Ссылка в новой задаче