commit c8febecaa6aadd5e35e515ee6c4f70e9f8bb5433 parent 5026f9a51493355306f548e004e863a421060c2c Author: Kyle Milz <milz@imac.0x30.net> Date: Thu, 4 Mar 2021 12:22:58 -0800 gl: clean up Makefile Diffstat:
| M | gl/Makefile | | | 53 | +++++++++++++++++++++++++++++------------------------ |
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/gl/Makefile b/gl/Makefile @@ -1,26 +1,35 @@ - -# else if $(OS) = "Darwin" { -# GL_EXTRALIB = "-framework OpenGL" ; -# } -#else if $(OS) = "Linux" { -# INST_EXTRALIB = "-lbsd" ; -# GL_EXTRALIB = "-lbsd" ; -# } - PROG= citrun_gl -PKGS = glu glfw3 glew glyphy freetype2 # osmesa +# +# Darwin users need this. +#LD_ADD += -framework OpenGL +# +# Linux users need this. +#LD_ADD += "-lbsd" +# + +PKGS += glu +PKGS += glfw3 +PKGS += glew +PKGS += glyphy +PKGS += freetype2 +#PKGS += osmesa + +SRCS += gl.cc +SRCS += gl_atlas.cc +SRCS += gl_buffer.cc +SRCS += gl_font.cc +SRCS += gl_main.cc +SRCS += gl_runtime.cc +SRCS += gl_shader.cc +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} -SRCS = gl.cc \ - gl_atlas.cc \ - gl_buffer.cc \ - gl_font.cc \ - gl_main.cc \ - gl_runtime.cc \ - gl_shader.cc \ - gl_state.cc \ - gl_view.cc \ - matrix4x4.c #Stringize gl_atlas_glsl.h : gl_atlas.glsl ; #Stringize gl_vshader_glsl.h : gl_vshader.glsl ; @@ -32,9 +41,5 @@ SRCS = gl.cc \ cat $< >> $@ echo ")\";" >> $@ -CXXFLAGS_PC != pkg-config --cflags ${PKGS} -CXXFLAGS += $(CXXFLAGS_PC) -LDADD !!= pkg-config --libs ${PKGS} - .include <bsd.prog.mk>