mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Forgotten piece of Jeremy Lea's patch
This commit is contained in:
parent
e00c2ffa73
commit
358f737b24
@ -23,25 +23,15 @@ VPATH = @srcdir@
|
|||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
ifdef STANDALONE_IMAGE_LIB
|
ifdef STANDALONE_IMAGE_LIB
|
||||||
DIRS = png public src
|
DIRS = public src
|
||||||
EXTRA_LIBS = libzlib.a libpng.a
|
|
||||||
else
|
else
|
||||||
DIRS = classes public src
|
DIRS = classes public src
|
||||||
|
|
||||||
EXTRA_LIBS =
|
|
||||||
|
|
||||||
ifdef MOZ_NATIVE_PNG
|
|
||||||
EXTRA_LIBS += -lpng
|
|
||||||
else
|
|
||||||
DIRS += png
|
|
||||||
EXTRA_LIBS += libpng.a
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_NATIVE_ZLIB
|
ifndef MOZ_NATIVE_PNG
|
||||||
EXTRA_LIBS += -lz
|
DIRS += png
|
||||||
else
|
|
||||||
EXTRA_LIBS += libzlib.a
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
EXTRA_LIBS = $(PNG_LIBS) $(ZLIB_LIBS)
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
Loading…
Reference in New Issue
Block a user