citrun

commit b4d8c5026be15d97628f065a91163c3682b617ad
parent f53a4f16ac181ce8a7f2ab532be501a94522dfea
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Sat, 19 Mar 2016 17:04:28 -0600

viewer: link against glyphy and fix compile error

Diffstat:
M
viewer/Makefile
 | 
2
+-
M
viewer/demo-common.h
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/viewer/Makefile b/viewer/Makefile
@@ -7,6 +7,6 @@ CXXFLAGS += -std=c++11
 CXXFLAGS += `pkg-config gl glew ftgl --cflags`
 
 LDFLAGS += `pkg-config gl glew ftgl --libs`
-LDADD += -lstdc++ -lz -lglut
+LDADD += -lstdc++ -lz -lglut ../glyphy/libglyphy.a
 
 .include <bsd.prog.mk>
diff --git a/viewer/demo-common.h b/viewer/demo-common.h
@@ -32,9 +32,9 @@
 
 #include <GL/glew.h>
 #include <GLES2/gl2.h>
-#include <OpenGL/OpenGL.h>
 
 #if defined(__APPLE__)
+#  include <OpenGL/OpenGL.h>
 #  include <GLUT/glut.h>
 #else
 #  include <GL/glut.h>