citrun

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

commit 2d2c5478f56e298e90e2fc2d28f61d21484d58a0
parent fa51f854c412a48f73855e3b8559ff0dd236e98c
Author: Kyle Milz <kyle@0x30.net>
Date:   Sun, 22 Jan 2017 23:18:43 -0700

configure: move FONT_PATH definitions closer to use

Diffstat:
MJamfile | 1-
Mconfigure | 5-----
Mgl_font.cc | 12++++++++++++
3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Jamfile b/Jamfile @@ -44,7 +44,6 @@ Stringize demo_atlas_glsl.h : demo_atlas.glsl ; Stringize demo_vshader_glsl.h : demo_vshader.glsl ; Stringize demo_fshader_glsl.h : demo_fshader.glsl ; -ObjectDefines gl_font.cc : FONT_PATH=\\\"$(FONT_PATH)\\\" ; ObjectC++Flags gl_main.cc gltest.cc $(GL_SRCS) : $(GL_CFLAGS) ; LINKLIBS on citrun_gl citrun_gltest += -lm $(GL_LIBS) ; diff --git a/configure b/configure @@ -15,7 +15,6 @@ echo # Operating system specific variables. uname=`uname` if [ $uname = OpenBSD ]; then - FONT_PATH="/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf" CXX=${CXX-eg++} LLVM_INCLUDES='-I/usr/local/include' #LLVM_INCLUDES='-I/usr/src/gnu/llvm/tools/clang/include @@ -24,11 +23,9 @@ if [ $uname = OpenBSD ]; then #-I/usr/obj/gnu/usr.bin/clang/include' elif [ $uname = Darwin ]; then GL_EXTRALIB="-framework OpenGL" - FONT_PATH="/Library/Fonts/Andale Mono.ttf" elif [ $uname = Linux ]; then GL_EXTRALIB="-lbsd" INST_EXTRALIB="-lbsd" - FONT_PATH="/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf" else echo WARNING: Platform $uname not tested. Compilation may fail. echo @@ -117,8 +114,6 @@ C++FLAGS += ${CFLAGS-} -Wall -W -Wcast-qual -Wdelete-non-virtual-dtor ; LINKFLAGS += ${LDFLAGS-} ; -FONT_PATH = "${FONT_PATH}" ; - GL_CFLAGS = `pkg-config --cflags glfw3 glew freetype2` ; GL_LIBS = ${GL_EXTRALIB-} `pkg-config --libs glfw3 glew freetype2` ; GLTEST_LIBS = `pkg-config --libs osmesa` ; diff --git a/gl_font.cc b/gl_font.cc @@ -24,6 +24,18 @@ #include "gl_font.h" #include "glyphy/glyphy-freetype.h" +#if defined(__OpenBSD__) +#define FONT_PATH "/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf" +#elif defined(__APPLE__) +#define FONT_PATH "/Library/Fonts/Andale Mono.ttf" +#elif defined(__gnu_linux__) +#define FONT_PATH "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf" +#elif defined(_WIN32) +#define FONT_PATH "" +#else +#error "Font string not configured." +#endif + typedef std::unordered_map<unsigned int, glyph_info_t> glyph_cache_t; FT_Library ft_library;