# HG changeset patch # User John Tsiombikas # Date 1395715061 -7200 # Node ID b0bf3786bd5be87272f1953d62ef215f4db33898 # Parent d317eb4f83da12eb4e220678716e237feda5c6a8 fixed the makefile to use vmath and anim as external dependencies diff -r d317eb4f83da -r b0bf3786bd5b Makefile --- a/Makefile Tue Mar 25 03:19:55 2014 +0200 +++ b/Makefile Tue Mar 25 04:37:41 2014 +0200 @@ -10,11 +10,9 @@ openctm = libs/openctm/libopenctm.a tinyxml2 = libs/tinyxml2/libtinyxml2.a -vmath = libs/vmath/libvmath.a -anim = libs/anim/libanim.a -extinc = -Ilibs/openctm -Ilibs/tinyxml2 -Ilibs/anim -extlibs = $(openctm) $(tinyxml2) $(anim) $(vmath) +extinc = -Ilibs/openctm -Ilibs/tinyxml2 +extlibs = $(openctm) $(tinyxml2) name = goat3d so_major = 0 @@ -37,7 +35,7 @@ CC = clang CXX = clang++ CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(pic) $(extinc) -LDFLAGS = $(extlibs) -lpthread +LDFLAGS = $(extlibs) -lvmath -lanim -lpthread .PHONY: all all: $(lib_so) $(lib_a) @@ -56,14 +54,6 @@ $(tinyxml2): $(MAKE) -C libs/tinyxml2 -.PHONY: $(vmath) -$(vmath): - $(MAKE) -C libs/vmath - -.PHONY: $(anim) -$(anim): - $(MAKE) -C libs/anim - -include $(dep) %.d: %.cc @@ -77,8 +67,6 @@ cleanlibs: $(MAKE) -C libs/openctm clean $(MAKE) -C libs/tinyxml2 clean - $(MAKE) -C libs/vmath clean - $(MAKE) -C libs/anim clean .PHONY: cleandep cleandep: