diff options
| author | bptato <nincsnevem662@gmail.com> | 2024-06-20 21:28:23 +0200 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2024-06-20 22:38:33 +0200 |
| commit | 7f66b5ebc88936db974e3320d77c7ec9d4ab85e6 (patch) | |
| tree | 669b2c307e2ea84476d6bbfd46ef127c0fc1c6f9 /Makefile | |
| parent | 2ab1e53b4bc15af3319994fdb25bb739b4b8e6db (diff) | |
| download | chawan-7f66b5ebc88936db974e3320d77c7ec9d4ab85e6.tar.gz | |
img: use stb_image, drop zlib as dependency
Now we have decoders for gif, jpeg, bmp. Also, the in-house PNG decoder has been replaced in favor of the stbi implementation; this means we no longer depend on zlib, since stbi comes with a built in inflate implementation.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile index fdb900bb..543bc99c 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ all: $(OUTDIR_BIN)/cha $(OUTDIR_BIN)/mancha $(OUTDIR_CGI_BIN)/http \ $(OUTDIR_CGI_BIN)/cha-finger $(OUTDIR_CGI_BIN)/about \ $(OUTDIR_CGI_BIN)/data $(OUTDIR_CGI_BIN)/file $(OUTDIR_CGI_BIN)/ftp \ $(OUTDIR_CGI_BIN)/man $(OUTDIR_CGI_BIN)/spartan \ - $(OUTDIR_CGI_BIN)/png \ + $(OUTDIR_CGI_BIN)/stbi \ $(OUTDIR_LIBEXEC)/urldec $(OUTDIR_LIBEXEC)/urlenc \ $(OUTDIR_LIBEXEC)/md2html $(OUTDIR_LIBEXEC)/ansi2html @@ -174,6 +174,13 @@ $(OUTDIR_CGI_BIN)/png: adapter/img/png.nim src/utils/sandbox.nim -d:disableSandbox=$(DANGER_DISABLE_SANDBOX) \ -o:"$(OUTDIR_CGI_BIN)/png" adapter/img/png.nim +$(OUTDIR_CGI_BIN)/stbi: adapter/img/stbi.nim adapter/img/stb_image.c \ + adapter/img/stb_image.h src/utils/sandbox.nim + @mkdir -p "$(OUTDIR_CGI_BIN)" + $(NIMC) $(FLAGS) --nimcache:"$(OBJDIR)/$(TARGET)/stbi" \ + -d:disableSandbox=$(DANGER_DISABLE_SANDBOX) \ + -o:"$(OUTDIR_CGI_BIN)/stbi" adapter/img/stbi.nim + $(OUTDIR_LIBEXEC)/urldec: adapter/tools/urldec.nim src/utils/twtstr.nim @mkdir -p "$(OUTDIR_LIBEXEC)" $(NIMC) $(FLAGS) --nimcache:"$(OBJDIR)/$(TARGET)/urldec" \ @@ -194,7 +201,6 @@ doc/cha-%.5: $(OBJDIR)/man/cha-%.md .PHONY: clean clean: rm -rf "$(OBJDIR)/$(TARGET)" - rm -rf "$(QJSOBJ)" rm -f lib/libquickjs.a MANPAGES1 = doc/cha.1 doc/mancha.1 @@ -228,7 +234,8 @@ install: install -m755 "$(OUTDIR_CGI_BIN)/cha-finger" $(LIBEXECDIR_CHAWAN)/cgi-bin install -m755 "$(OUTDIR_CGI_BIN)/man" $(LIBEXECDIR_CHAWAN)/cgi-bin install -m755 "$(OUTDIR_CGI_BIN)/spartan" $(LIBEXECDIR_CHAWAN)/cgi-bin - install -m755 "$(OUTDIR_CGI_BIN)/png" $(LIBEXECDIR_CHAWAN)/cgi-bin + #install -m755 "$(OUTDIR_CGI_BIN)/png" $(LIBEXECDIR_CHAWAN)/cgi-bin + install -m755 "$(OUTDIR_CGI_BIN)/stbi" $(LIBEXECDIR_CHAWAN)/cgi-bin install -m755 "$(OUTDIR_LIBEXEC)/urldec" $(LIBEXECDIR_CHAWAN)/urldec install -m755 "$(OUTDIR_LIBEXEC)/urlenc" $(LIBEXECDIR_CHAWAN)/urlenc mkdir -p "$(DESTDIR)$(MANPREFIX1)" |