diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:19 +0200 |
| commit | cd323c02240af01eb914c87d9d7c41db6e34984b (patch) | |
| tree | f040bcd063d5de45d287ea93a08dda46c848a70e /lib/Makefile | |
| parent | 6a6402414852d994ce67f5df1eb7ff6e827d531b (diff) | |
| parent | f65c991d410bc5e04cf0798618f94a0627f33057 (diff) | |
| download | barebox-cd323c02240af01eb914c87d9d7c41db6e34984b.tar.gz barebox-cd323c02240af01eb914c87d9d7c41db6e34984b.tar.xz | |
Merge branch 'for-next/png'
Conflicts:
common/filetype.c
include/filetype.h
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 4e6b1ee90..7bce0e58c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -34,3 +34,8 @@ obj-$(CONFIG_UNCOMPRESS) += uncompress.o obj-$(CONFIG_BCH) += bch.o obj-$(CONFIG_BITREV) += bitrev.o obj-$(CONFIG_QSORT) += qsort.o +obj-$(CONFIG_BMP) += bmp.o +obj-$(CONFIG_IMAGE_RENDERER) += image_renderer.o graphic_utils.o +obj-$(CONFIG_PNG) += png.o +obj-$(CONFIG_LODEPNG) += png_lode.o lodepng.o +obj-$(CONFIG_PICOPNG) += png_pico.o picopng.o |