citrun

commit 41cb5231fb12381ed0c0a0ae68dec6559d4d64eb
parent 599356c3d4a07051be29eaf4c21e588d8c3b3c8b
Author: Kyle Milz <kyle@0x30.net>
Date:   Wed, 13 Jul 2016 20:11:04 -0600

src: move font path ifdef's to top of file

Diffstat:
M
src/gl_main.cc
 | 
17
++++++++---------

1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/gl_main.cc b/src/gl_main.cc
@@ -10,6 +10,13 @@
 #include "gl_buffer.h"
 #include "demo-font.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"
+#endif
 
 class window {
 public:
@@ -77,16 +84,8 @@ window::window(int argc, char *argv[])
 
 	FT_Init_FreeType(&ft_library);
 
-#if defined(__OpenBSD__)
-	const char *font_path = "/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf";
-#elif defined(__APPLE__)
-	const char *font_path = "/Library/Fonts/Andale Mono.ttf";
-#elif defined(__gnu_linux__)
-	// Assuming Debian here
-	const char *font_path = "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf";
-#endif
 	ft_face = NULL;
-	FT_New_Face(ft_library, font_path, /* face_index */ 0, &ft_face);
+	FT_New_Face(ft_library, FONT_PATH, /* face_index */ 0, &ft_face);
 
 	font = demo_font_create(ft_face, demo_glstate_get_atlas(st));