# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1389893229 -7200
# Node ID 0be413ac2e0ab8ef53f49ba16e161de0b8d7937f
# Parent  0ecb788a87f772edde5bc98c029a6f7219a27ae2
ass2goat compiles...

diff -r 0ecb788a87f7 -r 0be413ac2e0a Makefile
--- a/Makefile	Thu Jan 16 19:13:45 2014 +0200
+++ b/Makefile	Thu Jan 16 19:27:09 2014 +0200
@@ -37,7 +37,7 @@
 CC = clang
 CXX = clang++
 CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(pic) $(extinc)
-LDFLAGS = $(extlibs)
+LDFLAGS = $(extlibs) -lpthread
 
 .PHONY: all
 all: $(lib_so) $(lib_a)
@@ -48,15 +48,19 @@
 $(lib_a): $(obj) $(extlibs)
 	$(AR) rcs $@ $(obj) $(extlibs)
 
+.PHONY: $(openctm)
 $(openctm):
 	$(MAKE) -C libs/openctm
 
+.PHONY: $(tinyxml2)
 $(tinyxml2):
 	$(MAKE) -C libs/tinyxml2
 
+.PHONY: $(vmath)
 $(vmath):
 	$(MAKE) -C libs/vmath
 
+.PHONY: $(anim)
 $(anim):
 	$(MAKE) -C libs/anim
 
diff -r 0ecb788a87f7 -r 0be413ac2e0a src/goat3d.cc
--- a/src/goat3d.cc	Thu Jan 16 19:13:45 2014 +0200
+++ b/src/goat3d.cc	Thu Jan 16 19:27:09 2014 +0200
@@ -909,7 +909,7 @@
 	return ftell((FILE*)uptr);
 }
 
-std::string goat3d_clean_filename(const char *str)
+std::string g3dimpl::goat3d_clean_filename(const char *str)
 {
 	const char *last_slash = strrchr(str, '/');
 	if(!last_slash) {
diff -r 0ecb788a87f7 -r 0be413ac2e0a src/goat3d_read.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/goat3d_read.cc	Thu Jan 16 19:27:09 2014 +0200
@@ -0,0 +1,13 @@
+#include "goat3d_impl.h"
+
+using namespace g3dimpl;
+
+bool Scene::load(goat3d_io *io)
+{
+	return false;
+}
+
+bool Scene::load_anim(goat3d_io *io)
+{
+	return false;
+}
diff -r 0ecb788a87f7 -r 0be413ac2e0a src/goat3d_readxml.cc
--- a/src/goat3d_readxml.cc	Thu Jan 16 19:13:45 2014 +0200
+++ b/src/goat3d_readxml.cc	Thu Jan 16 19:27:09 2014 +0200
@@ -67,6 +67,12 @@
 }
 
 
+bool Scene::load_anim_xml(goat3d_io *io)
+{
+	return false;
+}
+
+
 static Material *read_material(Scene *scn, XMLElement *xml_mtl)
 {
 	Material *mtl = new Material;
diff -r 0ecb788a87f7 -r 0be413ac2e0a src/goat3d_write.cc
--- a/src/goat3d_write.cc	Thu Jan 16 19:13:45 2014 +0200
+++ b/src/goat3d_write.cc	Thu Jan 16 19:27:09 2014 +0200
@@ -220,3 +220,8 @@
 	return size;
 }
 #endif
+
+bool Scene::save_anim(const XFormNode *node, goat3d_io *io) const
+{
+	return false;
+}
diff -r 0ecb788a87f7 -r 0be413ac2e0a src/scene.cc
--- a/src/scene.cc	Thu Jan 16 19:13:45 2014 +0200
+++ b/src/scene.cc	Thu Jan 16 19:27:09 2014 +0200
@@ -204,12 +204,7 @@
 	return (int)nodes.size();
 }
 
-
-bool Scene::load(goat3d_io *io)
-{
-	return false;
-}
-
+// Scene::load is defined in goat3d_read.cc
 // Scene::loadxml is defined in goat3d_readxml.cc
 // Scene::save is defined in goat3d_write.cc
 // Scene::savexml is defined in goat3d_writexml.cc