From 83b3fe86b1c13f40a6be4580b4079980030a54a7 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Fri, 30 Mar 2018 15:35:05 +0100 Subject: Simplify gl loading by removing m4 and merging gldefs.h m4 has been removed, loadgl.c.in is now gl.c, gldefs.h and loadgl.h.in have now been merged into gl.h. loadgl.m4 has been transformed into glfunc.h which is being used in the way of a bie index file to generate information at 3 places. lgl_load is now gl_load and doesn't return anything, the jongjmp.h method of error handling was pre-emptive and for now this much simpler system will suffice. This means that lgl_strerror is no longer neede. --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8681e8b..6810635 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBS)) -std=c11 -MMD -MP LDFLAGS += -Wl,--as-needed LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBS)) -lm -OBJ := gltest.o loadgl.o eprintf.o glprog.o +OBJ := gltest.o gl.o eprintf.o glprog.o all: $(PROG) @@ -23,10 +23,6 @@ include $(EPRINTF_PATH)/module.mk $(PROG): $(OBJ) gltest.o: assets.h -loadgl.o gltest.o glprog.o: loadgl.h -loadgl.c loadgl.h: loadgl.%: loadgl.m4 loadgl.%.in - m4 $^ >$@ -CLEAN += loadgl.c loadgl.h deplinks: $(EPRINTF_FILES) -- cgit v1.2.3-54-g00ecf