diff options
| author | Toomas Soome <tsoome@me.com> | 2018-12-01 22:31:08 +0200 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2019-01-07 10:11:18 +0100 |
| commit | 9890ff8357a674572254e0be06b175a1e8eab4b0 (patch) | |
| tree | 3b4b3a2b61f0cd74bd99b547f6e87c2688b4e122 /usr/src/lib/libficl | |
| parent | f33b666290305a2b2c134d23cbd1e70e06bf36fd (diff) | |
| download | illumos-joyent-9890ff8357a674572254e0be06b175a1e8eab4b0.tar.gz | |
10028 loader: implement framebuffer console
10029 common/font: create shared font.c
10030 import pnglite into usr/src/common/pnglite
8918 loader.efi: add vesa edid support
10031 loader: import tem for loader console
10032 loader: implement tem utf-8 support
10033 ficl: add simple gfx words
10034 loader: use term-drawrect for menu frame
10035 loader: add alpha blending for gfx_fb
10036 ficl: add fb-putimage
10037 loader: add illumos.png logo
10038 loader: replace gop and vesa with framebuffer
10039 loader: build rules for new font setup
10040 loader: gfx use GOP Blt() function in visual_io callbacks
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Diffstat (limited to 'usr/src/lib/libficl')
| -rw-r--r-- | usr/src/lib/libficl/Makefile.com | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index a7f4a3f63f..b4532d2ed9 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -21,7 +21,7 @@ VERS=.$(MAJOR).$(MINOR) OBJECTS= dictionary.o system.o fileaccess.o float.o double.o prefix.o search.o \ softcore.o stack.o tools.o vm.o primitives.o unix.o utility.o \ hash.o callback.o word.o loader.o pager.o extras.o \ - loader_emu.o lz4.o + loader_emu.o pnglite.o lz4.o include $(SRC)/lib/Makefile.lib @@ -29,17 +29,19 @@ LIBS= $(DYNLIB) $(LINTLIB) FICLDIR= $(SRC)/common/ficl CSTD= $(CSTD_GNU99) +PNGLITE= $(SRC)/common/pnglite CPPFLAGS += -I.. -I$(FICLDIR) -D_LARGEFILE64_SOURCE=1 +CPPFLAGS += -I$(PNGLITE) # As variable "count" is marked volatile, gcc 4.4.4 will complain about # function argument. So we switch this warning off # for time being, till gcc 4.4.4 will be replaced. pics/vm.o := CERRWARN += -_gcc=-Wno-clobbered -LDLIBS += -luuid -lc -lm -lumem +LDLIBS += -luuid -lz -lc -lm -lumem HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \ - $(FICLDIR)/ficlplatform/unix.h + $(FICLDIR)/ficlplatform/unix.h $(PNGLITE)/pnglite.h pics/%.o: ../softcore/%.c $(HEADERS) $(COMPILE.c) -o $@ $< @@ -61,6 +63,10 @@ pics/%.o: $(FICLDIR)/softcore/%.c $(HEADERS) $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) +pics/%.o: $(PNGLITE)/%.c $(HEADERS) + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) + $(LINTLIB) := SRCS= ../$(LINTSRC) all: $(LIBS) |
