diff options
| author | Michael Brown <mcb30@ipxe.org> | 2016-07-29 15:58:59 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2016-07-29 16:04:09 +0100 |
| commit | 2afd66eb55996500499eb3bcc39c66ff042679c8 (patch) | |
| tree | c7895a8b5b2a4297477a57c5dae68828476899ce /src/config | |
| parent | 1090839b94bcfec75b87438f154071908108927b (diff) | |
| download | ipxe-2afd66eb55996500499eb3bcc39c66ff042679c8.tar.gz | |
[pixbuf] Enable PNG format by default
Enable IMAGE_PNG (but not IMAGE_PNM) by default, and drag in the
relevant objects only when image_pixbuf() is present in the binary.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config.c | 6 | ||||
| -rw-r--r-- | src/config/config_pixbuf.c | 39 | ||||
| -rw-r--r-- | src/config/general.h | 2 |
3 files changed, 40 insertions, 7 deletions
diff --git a/src/config/config.c b/src/config/config.c index e24cfe0d0..c6683261f 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -182,12 +182,6 @@ REQUIRE_OBJECT ( efi_image ); #ifdef IMAGE_SDI REQUIRE_OBJECT ( sdi ); #endif -#ifdef IMAGE_PNM -REQUIRE_OBJECT ( pnm ); -#endif -#ifdef IMAGE_PNG -REQUIRE_OBJECT ( png ); -#endif /* * Drag in all requested commands diff --git a/src/config/config_pixbuf.c b/src/config/config_pixbuf.c new file mode 100644 index 000000000..f8ff59daf --- /dev/null +++ b/src/config/config_pixbuf.c @@ -0,0 +1,39 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + * + * You can also choose to distribute this program under the terms of + * the Unmodified Binary Distribution Licence (as given in the file + * COPYING.UBDL), provided that you have satisfied its requirements. + */ + +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); + +#include <config/general.h> + +/** @file + * + * Pixel buffer file format configuration + * + */ + +PROVIDE_REQUIRING_SYMBOL(); + +#ifdef IMAGE_PNM +REQUIRE_OBJECT ( pnm ); +#endif +#ifdef IMAGE_PNG +REQUIRE_OBJECT ( png ); +#endif diff --git a/src/config/general.h b/src/config/general.h index 38d629ccd..4b9904898 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -111,7 +111,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define IMAGE_EFI /* EFI image support */ //#define IMAGE_SDI /* SDI image support */ //#define IMAGE_PNM /* PNM image support */ -//#define IMAGE_PNG /* PNG image support */ +#define IMAGE_PNG /* PNG image support */ #define IMAGE_DER /* DER image support */ #define IMAGE_PEM /* PEM image support */ |