citrun

watch C/C++ source code execute
Log | Files | Refs | LICENSE

commit 8a59b6d7001d229e7e037085211d6cf6492ed082
parent bb98866b273876813905725110170733f4e823ae
Author: Kyle Milz <milz@black.my.domain>
Date:   Mon, 15 Apr 2019 16:36:56 -0700

use a common location for all gl pkg-config libraries

Diffstat:
MJamrules | 5+++--
Mbin/Jamfile | 6+++---
2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Jamrules b/Jamrules @@ -40,6 +40,8 @@ C++FLAGS += $(CFLAGS) -Wall -W -Wcast-qual LINKFLAGS += $(LDFLAGS) ; +gl_pkgs = "glfw3 glew glyphy freetype2" ; # osmesa + # Quote an entire file and add a variable declaration prefixing the string. rule Stringize { @@ -66,8 +68,7 @@ actions PkgConfig type pkg-config echo - gl_pkgs="osmesa glfw3 glew glyphy freetype2" - for pkg in $gl_pkgs; do + for pkg in $(gl_pkgs); do echo -n "$pkg = " pkg-config --modversion $pkg || echo "NOT FOUND" done diff --git a/bin/Jamfile b/bin/Jamfile @@ -71,10 +71,10 @@ Stringize gl_atlas_glsl.h : gl_atlas.glsl ; Stringize gl_vshader_glsl.h : gl_vshader.glsl ; Stringize gl_fshader_glsl.h : gl_fshader.glsl ; -ObjectC++Flags gl.cc gltest.cc $(GL_SRCS) : `pkg-config --cflags glyphy glfw3 glew freetype2` ; +ObjectC++Flags gl.cc gltest.cc $(GL_SRCS) : `pkg-config --cflags $(gl_pkgs)` ; -LINKLIBS on citrun_gl += -lm $(GL_EXTRALIB) `pkg-config --libs glyphy glfw3 glew freetype2` ; -LINKLIBS on citrun_gltest += -lm `pkg-config --libs glyphy glfw3 glew freetype2` ; +LINKLIBS on citrun_gl += -lm $(GL_EXTRALIB) `pkg-config --libs $(gl_pkgs)` ; +LINKLIBS on citrun_gltest += -lm `pkg-config --libs $(gl_pkgs)` ; LinkLibraries citrun_gl citrun_gltest : gl_common ;