Mercurial > hg > forks > bilotrip-mj12

changeset 12:2184f64b5b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Aug 2013 16:46:54 +0300
parents 470774c3b381
children c859c22c1af5
files Makefile
diffstat 1 files changed, 30 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Aug 05 15:02:50 2013 +0300
+++ b/Makefile	Mon Aug 05 16:46:54 2013 +0300
@@ -8,41 +8,41 @@
 
 OBJPATH=obj/
 
-ADD_LIBS=\
-	/usr/lib/i386-linux-gnu/libfreetype.so \
-	assimp--3.0.1270-source-only/lib/libassimp.so \
-	libbass/libbass.so \
-	/usr/lib/i386-linux-gnu/libGLEW.so \
-	/usr/lib/i386-linux-gnu/libvorbis.so \
-	/usr/lib/i386-linux-gnu/libtheoradec.so \
-	/usr/lib/i386-linux-gnu/libogg.so \
-	/usr/lib/i386-linux-gnu/libstdc++.so.6
 
 ###
 ### Depency library definitions
 ###
 BOOST_CFLAGS=-I/usr/include/
-BOOST_LDFLAGS=/usr/lib/libboost_thread.a /usr/lib/libboost_system.a
-
-BASS_CFLAGS=-Ilibbass/
-BASS_LDFLAGS=-L./ -lbass
-
-ASSIMP_CFLAGS=-Iassimp--3.0.1270-source-only/include/
-ASSIMP_LDFLAGS=-L./ -lassimp
+BOOST_LDFLAGS=-lboost_thread -lboost_system
+#/usr/lib/libboost_thread.a /usr/lib/libboost_system.a
 
 FREETYPE_CFLAGS=`pkg-config freetype2 --cflags`
 FREETYPE_LDFLAGS=`pkg-config freetype2 --libs`
 
-LIBOGGPLAYER=liboggplayer-src/
-LIBOGGPLAYER_CFLAGS=-I$(LIBOGGPLAYER)include/
-LIBOGGPLAYER_LDFLAGS=`pkg-config --libs ogg vorbis theoradec`
-LIBOGGPLAYER_A=$(LIBOGGPLAYER)lib/liboggplayer.a
-
 GLEW_CFLAGS=`pkg-config glew --cflags`
 GLEW_LDFLAGS=`pkg-config glew --libs`
 
 GLUT_CFLAGS=-I/usr/include/GL/
-GLUT_LDFLAGS=/usr/lib/i386-linux-gnu/libglut.a
+GLUT_LDFLAGS=-lglut
+#/usr/lib/i386-linux-gnu/libglut.a
+
+
+###
+### Included in source tree
+###
+BASS_CFLAGS=-Ilibbass/
+BASS_LDFLAGS=-L./lib/ -lbass
+
+ASSIMP=assimp--3.0.1270-source-only/
+ASSIMP_CFLAGS=-I$(ASSIMP)include/
+ASSIMP_LDFLAGS=-L./lib/ -lassimp
+
+
+LIBOGGPLAYER=liboggplayer-src/
+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
 
 
 DEMO_CFLAGS +=  $(BASS_CFLAGS) $(ASSIMP_CFLAGS) \
@@ -56,6 +56,10 @@
 		$(FREETYPE_LDFLAGS) $(BOOST_LDFLAGS) \
 		$(LIBOGGPLAYER_LDFLAGS)
 
+ADD_LIBS=\
+	$(ASSIMP)lib/libassimp.so \
+	libbass/libbass.so
+
 
 ###
 ### Source files etc
@@ -114,5 +118,8 @@
 clean:
 	$(RM) $(TARGETS) $(OBJPATH)*.o 
 
-build: demo.bin $(ADD_LIBS)
+assimp:
+	cd $(ASSIMP) && cmake . -DENABLE_BOOST_WORKAROUND=ON && make
+
+build: assimp demo.bin $(ADD_LIBS)
 	cp -d -p $(addsuffix *,$(ADD_LIBS)) lib/