Mercurial > hg > forks > bilotrip-mj12
changeset 28:ad838591513a
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 05 Aug 2013 18:23:20 +0300 |
parents | e29773ac3ceb (current diff) b6b0be5ac50c (diff) |
children | 4df6d9714314 |
files | |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 05 18:22:53 2013 +0300 +++ b/Makefile Mon Aug 05 18:23:20 2013 +0300 @@ -13,7 +13,7 @@ ### Depency library definitions ### BOOST_CFLAGS=-I/usr/include/ -BOOST_LDFLAGS=-lboost_thread -lboost_system +BOOST_LDFLAGS=-lboost_thread -lboost_system -lpthread #/usr/lib/libboost_thread.a /usr/lib/libboost_system.a FREETYPE_CFLAGS=`pkg-config freetype2 --cflags` @@ -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 @@ -42,19 +45,19 @@ LIBOGGPLAYER_CFLAGS=-I$(LIBOGGPLAYER)include/ #LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg vorbis theoradec` LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg theoradec` -LIBOGGPLAYER_A=$(LIBOGGPLAYER)lib/liboggplayer.a +LIBOGGPLAYER_A=$(OBJPATH)liboggplayer.a 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) @@ -81,20 +84,20 @@ $(OBJPATH)%.o: $(LIBOGGPLAYER)src/%.cpp $(LIBOGGPLAYER)src/%.hpp @echo " CXX $+" - $(CXX) $(CFLAGS) -c -o $@ $< $(LIBOGGPLAYER_CFLAGS) $(BOOST_CFLAGS) + @$(CXX) $(CFLAGS) -c -o $@ $< $(LIBOGGPLAYER_CFLAGS) $(BOOST_CFLAGS) $(OBJPATH)%.o: $(LIBOGGPLAYER)src/%.cpp @echo " CXX $+" - $(CXX) $(CFLAGS) -c -o $@ $< $(LIBOGGPLAYER_CFLAGS) $(BOOST_CFLAGS) + @$(CXX) $(CFLAGS) -c -o $@ $< $(LIBOGGPLAYER_CFLAGS) $(BOOST_CFLAGS) $(OBJPATH)%.o: src/%.c src/%.h @echo " CXX $+" - $(CXX) $(CFLAGS) -c -o $@ $< $(DEMO_CFLAGS) + @$(CXX) $(CFLAGS) -c -o $@ $< $(DEMO_CFLAGS) $(OBJPATH)%.o: src/%.c @echo " CXX $+" - $(CXX) $(CFLAGS) -c -o $@ $< $(DEMO_CFLAGS) + @$(CXX) $(CFLAGS) -c -o $@ $< $(DEMO_CFLAGS) $(LIBOGGPLAYER_A): $(addprefix $(OBJPATH),$(LIBOGGPLAYER_OBJS))