Mercurial > hg > forks > bilotrip-mj12

comparison Makefile @ 22:9316a55ea198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix liboggplayer.a target path.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Aug 2013 18:07:02 +0300
parents c85ee156a83a
children 0dce9bac4043
comparison
equal deleted inserted replaced
21:c85ee156a83a 22:9316a55ea198
40 40
41 LIBOGGPLAYER=liboggplayer-src/ 41 LIBOGGPLAYER=liboggplayer-src/
42 LIBOGGPLAYER_CFLAGS=-I$(LIBOGGPLAYER)include/ 42 LIBOGGPLAYER_CFLAGS=-I$(LIBOGGPLAYER)include/
43 #LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg vorbis theoradec` 43 #LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg vorbis theoradec`
44 LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg theoradec` 44 LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg theoradec`
45 LIBOGGPLAYER_A=$(LIBOGGPLAYER)lib/liboggplayer.a 45 LIBOGGPLAYER_A=$(OBJPATH)liboggplayer.a
46 46
47 47
48 DEMO_CFLAGS += $(BASS_CFLAGS) $(ASSIMP_CFLAGS) \ 48 DEMO_CFLAGS += $(BASS_CFLAGS) $(ASSIMP_CFLAGS) \
49 $(LIBOGGPLAYER_CFLAGS) $(FREETYPE_CFLAGS) \ 49 $(LIBOGGPLAYER_CFLAGS) $(FREETYPE_CFLAGS) \
50 $(GLEW_CFLAGS) $(GLUT_CFLAGS) \ 50 $(GLEW_CFLAGS) $(GLUT_CFLAGS) \