Mercurial > hg > forks > bilotrip-mj12
changeset 25:b6b0be5ac50c
Add OpenGL linking.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 05 Aug 2013 18:11:20 +0300 |
parents | c88e8f589c32 |
children | ad838591513a |
files | Makefile |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 05 18:08:49 2013 +0300 +++ b/Makefile Mon Aug 05 18:11:20 2013 +0300 @@ -26,6 +26,9 @@ GLUT_LDFLAGS=-lglut #/usr/lib/i386-linux-gnu/libglut.a +OPENGL_CFLAGS=`pkg-config gl glu --cflags` +OPENGL_LDFLAGS=`pkg-config gl glu --libs` + ### ### Included in source tree @@ -48,13 +51,13 @@ DEMO_CFLAGS += $(BASS_CFLAGS) $(ASSIMP_CFLAGS) \ $(LIBOGGPLAYER_CFLAGS) $(FREETYPE_CFLAGS) \ $(GLEW_CFLAGS) $(GLUT_CFLAGS) \ - $(FREETYPE_CFLAGS) + $(FREETYPE_CFLAGS) $(OPENGL_CFLAGS) DEMO_LDFLAGS = $(BASS_LDFLAGS) $(ASSIMP_LDFLAGS) \ $(LIBOGGPLAYER_A) $(FREETYPE_LDFLAGS) \ $(GLEW_LDFLAGS) $(GLUT_LDFLAGS) \ $(FREETYPE_LDFLAGS) $(BOOST_LDFLAGS) \ - $(LIBOGGPLAYER_LDFLAGS) + $(LIBOGGPLAYER_LDFLAGS) $(OPENGL_LDFLAGS)