goat3d

changeset 59:b0bf3786bd5b

find changesets by author, revision, files, or words in the commit message
fixed the makefile to use vmath and anim as external dependencies
author John Tsiombikas <nuclear@member.fsf.org>
date Tue, 25 Mar 2014 04:37:41 +0200
parents d317eb4f83da
children 0c3576325480
files Makefile
diffstat 1 files changed, 3 insertions(+), 15 deletions(-) [+]
line diff
     1.1 --- a/Makefile	Tue Mar 25 03:19:55 2014 +0200
     1.2 +++ b/Makefile	Tue Mar 25 04:37:41 2014 +0200
     1.3 @@ -10,11 +10,9 @@
     1.4  
     1.5  openctm = libs/openctm/libopenctm.a
     1.6  tinyxml2 = libs/tinyxml2/libtinyxml2.a
     1.7 -vmath = libs/vmath/libvmath.a
     1.8 -anim = libs/anim/libanim.a
     1.9  
    1.10 -extinc = -Ilibs/openctm -Ilibs/tinyxml2 -Ilibs/anim
    1.11 -extlibs = $(openctm) $(tinyxml2) $(anim) $(vmath)
    1.12 +extinc = -Ilibs/openctm -Ilibs/tinyxml2
    1.13 +extlibs = $(openctm) $(tinyxml2)
    1.14  
    1.15  name = goat3d
    1.16  so_major = 0
    1.17 @@ -37,7 +35,7 @@
    1.18  CC = clang
    1.19  CXX = clang++
    1.20  CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(pic) $(extinc)
    1.21 -LDFLAGS = $(extlibs) -lpthread
    1.22 +LDFLAGS = $(extlibs) -lvmath -lanim -lpthread
    1.23  
    1.24  .PHONY: all
    1.25  all: $(lib_so) $(lib_a)
    1.26 @@ -56,14 +54,6 @@
    1.27  $(tinyxml2):
    1.28  	$(MAKE) -C libs/tinyxml2
    1.29  
    1.30 -.PHONY: $(vmath)
    1.31 -$(vmath):
    1.32 -	$(MAKE) -C libs/vmath
    1.33 -
    1.34 -.PHONY: $(anim)
    1.35 -$(anim):
    1.36 -	$(MAKE) -C libs/anim
    1.37 -
    1.38  -include $(dep)
    1.39  
    1.40  %.d: %.cc
    1.41 @@ -77,8 +67,6 @@
    1.42  cleanlibs:
    1.43  	$(MAKE) -C libs/openctm clean
    1.44  	$(MAKE) -C libs/tinyxml2 clean
    1.45 -	$(MAKE) -C libs/vmath clean
    1.46 -	$(MAKE) -C libs/anim clean
    1.47  
    1.48  .PHONY: cleandep
    1.49  cleandep: