1.1 --- a/Makefile	Thu Jan 16 19:13:45 2014 +0200
     1.2 +++ b/Makefile	Thu Jan 16 19:27:09 2014 +0200
     1.3 @@ -37,7 +37,7 @@
     1.4  CC = clang
     1.5  CXX = clang++
     1.6  CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(pic) $(extinc)
     1.7 -LDFLAGS = $(extlibs)
     1.8 +LDFLAGS = $(extlibs) -lpthread
     1.9  
    1.10  .PHONY: all
    1.11  all: $(lib_so) $(lib_a)
    1.12 @@ -48,15 +48,19 @@
    1.13  $(lib_a): $(obj) $(extlibs)
    1.14  	$(AR) rcs $@ $(obj) $(extlibs)
    1.15  
    1.16 +.PHONY: $(openctm)
    1.17  $(openctm):
    1.18  	$(MAKE) -C libs/openctm
    1.19  
    1.20 +.PHONY: $(tinyxml2)
    1.21  $(tinyxml2):
    1.22  	$(MAKE) -C libs/tinyxml2
    1.23  
    1.24 +.PHONY: $(vmath)
    1.25  $(vmath):
    1.26  	$(MAKE) -C libs/vmath
    1.27  
    1.28 +.PHONY: $(anim)
    1.29  $(anim):
    1.30  	$(MAKE) -C libs/anim
    1.31  

     2.1 --- a/src/goat3d.cc	Thu Jan 16 19:13:45 2014 +0200
     2.2 +++ b/src/goat3d.cc	Thu Jan 16 19:27:09 2014 +0200
     2.3 @@ -909,7 +909,7 @@
     2.4  	return ftell((FILE*)uptr);
     2.5  }
     2.6  
     2.7 -std::string goat3d_clean_filename(const char *str)
     2.8 +std::string g3dimpl::goat3d_clean_filename(const char *str)
     2.9  {
    2.10  	const char *last_slash = strrchr(str, '/');
    2.11  	if(!last_slash) {

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/goat3d_read.cc	Thu Jan 16 19:27:09 2014 +0200
     3.3 @@ -0,0 +1,13 @@
     3.4 +#include "goat3d_impl.h"
     3.5 +
     3.6 +using namespace g3dimpl;
     3.7 +
     3.8 +bool Scene::load(goat3d_io *io)
     3.9 +{
    3.10 +	return false;
    3.11 +}
    3.12 +
    3.13 +bool Scene::load_anim(goat3d_io *io)
    3.14 +{
    3.15 +	return false;
    3.16 +}

     4.1 --- a/src/goat3d_readxml.cc	Thu Jan 16 19:13:45 2014 +0200
     4.2 +++ b/src/goat3d_readxml.cc	Thu Jan 16 19:27:09 2014 +0200
     4.3 @@ -67,6 +67,12 @@
     4.4  }
     4.5  
     4.6  
     4.7 +bool Scene::load_anim_xml(goat3d_io *io)
     4.8 +{
     4.9 +	return false;
    4.10 +}
    4.11 +
    4.12 +
    4.13  static Material *read_material(Scene *scn, XMLElement *xml_mtl)
    4.14  {
    4.15  	Material *mtl = new Material;

     5.1 --- a/src/goat3d_write.cc	Thu Jan 16 19:13:45 2014 +0200
     5.2 +++ b/src/goat3d_write.cc	Thu Jan 16 19:27:09 2014 +0200
     5.3 @@ -220,3 +220,8 @@
     5.4  	return size;
     5.5  }
     5.6  #endif
     5.7 +
     5.8 +bool Scene::save_anim(const XFormNode *node, goat3d_io *io) const
     5.9 +{
    5.10 +	return false;
    5.11 +}

     6.1 --- a/src/scene.cc	Thu Jan 16 19:13:45 2014 +0200
     6.2 +++ b/src/scene.cc	Thu Jan 16 19:27:09 2014 +0200
     6.3 @@ -204,12 +204,7 @@
     6.4  	return (int)nodes.size();
     6.5  }
     6.6  
     6.7 -
     6.8 -bool Scene::load(goat3d_io *io)
     6.9 -{
    6.10 -	return false;
    6.11 -}
    6.12 -
    6.13 +// Scene::load is defined in goat3d_read.cc
    6.14  // Scene::loadxml is defined in goat3d_readxml.cc
    6.15  // Scene::save is defined in goat3d_write.cc
    6.16  // Scene::savexml is defined in goat3d_writexml.cc