diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 19:32:23 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-15 12:26:42 +0000 |
| commit | 4b0851493dce7cb5a6ada6e525da0bda6f5048dd (patch) | |
| tree | ed512ff09b7554ef73b20d3b9c1070be6fb6a45d /com32/lib/Makefile | |
| parent | bd7ce1bbf3393be32ee63a5139fffd1aae11c7fd (diff) | |
| download | syslinux-4b0851493dce7cb5a6ada6e525da0bda6f5048dd.tar.gz | |
sys/vesa: Modularise common vesa code
There's lots of the vesa infrastructure that can be shared for both
BIOS and EFI, so share the things that are common and split out the
things that are not into firmware-specific functions and use the
'firmware' structure to access them.
This commit is part of a series of changes that removes all
EFI-specific code from everywhere except efi/, which means we can
delete inclusion of any gnu-efi header files and remove gnu-efi paths
from CFLAGS.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/lib/Makefile')
| -rw-r--r-- | com32/lib/Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 81e6fcd1..46a53b5c 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -22,19 +22,11 @@ LIBJPG_OBJS = \ jpeg/rgb24.o jpeg/bgr24.o jpeg/yuv420p.o jpeg/grey.o \ jpeg/rgba32.o jpeg/bgra32.o -ifndef EFI_BUILD LIBVESA_OBJS = \ sys/vesacon_write.o sys/vesaserial_write.o \ sys/vesa/initvesa.o sys/vesa/drawtxt.o sys/vesa/background.o \ - sys/vesa/alphatbl.o sys/vesa/screencpy.o sys/vesa/fmtpixel.o \ + sys/vesa/alphatbl.o sys/vesa/fmtpixel.o \ sys/vesa/i915resolution.o -else -LIBVESA_OBJS = \ - sys/vesacon_write.o sys/vesaserial_write.o \ - sys/vesa/efi/initvesa.o sys/vesa/efi/drawtxt.o sys/vesa/efi/background.o \ - sys/vesa/alphatbl.o sys/vesa/efi/screencpy.o sys/vesa/efi/fmtpixel.o \ - sys/vesa/efi/i915resolution.o -endif LIBMISC_OBJS = \ sys/libansi.o sys/gpxe.o @@ -124,12 +116,7 @@ errlist.c: makeerrlist.pl $(SRC)/../include/errno.h $(PERL) $< $(CFLAGS) -errlist > $@ || rm -f $@ # These files are performance critical, and doesn't compile well with -Os -#FIXME: determine if drawtxt.c is really EFI-dependent -#ifndef EFI_BUILD sys/vesa/drawtxt.o: sys/vesa/drawtxt.c -#else -sys/vesa/efi/drawtxt.o: sys/vesa/efi/drawtxt.c -#endif $(CC) $(MAKEDEPS) $(CFLAGS) -O3 -c -o $@ $< sys/vesa/alphatbl.c: sys/vesa/alphatbl.pl |