From 99b580a1d7325face434363baaf66bc7f827f28b Mon Sep 17 00:00:00 2001 From: tth Date: Mon, 27 Jun 2022 09:00:44 +0200 Subject: [PATCH] television compiled --- .gitignore | 3 ++- Lib/Makefile | 6 +++++- Lib/tele_2.c | 2 +- Tools/Makefile | 6 +++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 34afdab..7e55663 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,6 @@ Lib/t_t16x24 Tools/tga_cadre Tools/tga_tools Tools/tga_effects - +Tools/tga_filtres +Tools/tga_television diff --git a/Lib/Makefile b/Lib/Makefile index 5bc9b6a..5b08691 100644 --- a/Lib/Makefile +++ b/Lib/Makefile @@ -8,6 +8,8 @@ include ../Paramakes.mk DEPS = ../tthimage.h ../Paramakes.mk Makefile +all: foo testtga + #----------------------------------------------------------------- 7seg.o: 7seg.c $(DEPS) @@ -102,6 +104,7 @@ scale.o: scale.c $(DEPS) sobel4.o: sobel4.c $(DEPS) tamppool.o: tamppool.c $(DEPS) +tele_2.o: tele_2.c $(DEPS) television.o: television.c $(DEPS) text0.o: text0.c $(DEPS) text1.o: text1.c $(DEPS) @@ -147,7 +150,8 @@ OBJECTS = 7seg.o \ ptlist.o \ recurse.o rgbmask.o \ scale.o sobel4.o \ - tamppool.o television.o text0.o text1.o text16x24.o \ + tamppool.o tele_2.o television.o \ + text0.o text1.o text16x24.o \ tga.o tools.o \ vignetize.o \ warp0.o warp1.o warp2.o warp3.o \ diff --git a/Lib/tele_2.c b/Lib/tele_2.c index b0ba873..0664a66 100644 --- a/Lib/tele_2.c +++ b/Lib/tele_2.c @@ -8,7 +8,7 @@ #include #include -#include "tthimage.h" +#include "../tthimage.h" /*::------------------------------------------------------------------::*/ /* diff --git a/Tools/Makefile b/Tools/Makefile index 43fc1cc..c1124af 100644 --- a/Tools/Makefile +++ b/Tools/Makefile @@ -8,7 +8,8 @@ include ../Paramakes.mk DEPS = ../tthimage.h Makefile -all: tga_cadre tga_effects tga_filtres tga_tools +all: tga_cadre tga_effects tga_filtres tga_tools \ + tga_television #----------------------------------------------------------------- @@ -26,6 +27,9 @@ tga_effects: tga_effects.c $(DEPS) fonctions.o tga_filtres: tga_filtres.c $(DEPS) fonctions.o gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@ +tga_television: tga_television.c $(DEPS) fonctions.o + gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@ + tga_tools: tga_tools.c $(DEPS) fonctions.o gcc $(CFLAGS) $< ../libimage.a fonctions.o -lm -o $@