commit 4d5651f54db05621b841c65552ecdb00363f92fc parent c2e776bac0290f2bd1be6f88d9c27ac4663f4bd9 Author: Kyle Milz <krwmilz@gmail.com> Date: Tue, 28 Feb 2023 04:16:58 +0000 gl: clean up Makefile Diffstat:
| M | gl/Makefile | | | 20 | +++++++++----------- |
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/gl/Makefile b/gl/Makefile @@ -1,4 +1,4 @@ -PROG= citrun_gl +PROG = citrun_gl # # Darwin users need this. @@ -8,12 +8,10 @@ PROG= citrun_gl #LD_ADD += "-lbsd" # -PKGS += glu -PKGS += glfw3 -PKGS += glew -PKGS += glyphy -PKGS += freetype2 -#PKGS += osmesa +PKGS = glu glfw3 glew glyphy freetype2 #osmesa + +PKGS_CFLAGS != pkg-config --cflags ${PKGS} +PKGS_LDADD != pkg-config --libs ${PKGS} SRCS += gl.cc SRCS += gl_atlas.cc @@ -26,10 +24,10 @@ SRCS += gl_state.cc SRCS += gl_view.cc SRCS += matrix4x4.c -CXXFLAGS_PC !!= pkg-config --cflags ${PKGS} -CXXFLAGS += $(CXXFLAGS_PC) -LDADD !!= pkg-config --libs ${PKGS} - +CXXFLAGS += ${PKGS_CFLAGS} +#CXXFLAGS += -Wmissing-prototypes -Wno-uninitialized -Wstrict-prototypes +#CXXFLAGS += -Wunused-parameter -Wshadow +LDADD += ${PKGS_LDADD} #Stringize gl_atlas_glsl.h : gl_atlas.glsl ; #Stringize gl_vshader_glsl.h : gl_vshader.glsl ;