looks like some compilation errors snuck into this one...

ef-gy · Nov 2, 2013 · 42bd6cc · 42bd6cc
1 parent b4d137c
commit 42bd6cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/topologic/parse.h b/include/topologic/parse.h
@@ -205,15 +205,15 @@ namespace topologic
     {
         if (d == sd)
         {
-            s.transformation.data[x][y] = vv;
+            s.transformation.transformationMatrix.data[x][y] = vv;
             return true;
         }
 
         return setMatrixCell<Q,d-1>(s, sd, x, y, vv);
     }
 
     template<typename Q, unsigned int d>
-    static bool setMatrixCell (state<Q,2> &, const unsigned int &, const unsigned int &, const Q &)
+    static bool setMatrixCell (state<Q,2> &, const unsigned int &, const unsigned int &, const unsigned int &, const Q &)
     {
         return false;
     }

diff --git a/makefile b/makefile
@@ -42,7 +42,7 @@ LDFLAGS:=
 JSFUNCTIONS:=['_main','_setRadius','_setPrecision','_updateModel','_updateProjection','_getProjection','_interpretDrag','_setActiveDimension','cwrap','_forceRedraw','_setIFSParameters','_setFlameColouring','_setColour','_setFlameParameters','_resetColourMap','_setViewportSize']
 
 DATABASE:=
-BINARIES:=$(filter-out %-glut %-gles %-json,$(basename $(notdir $(wildcard src/*.cpp))))
+BINARIES:=$(filter-out %-glut %-gles %-json %-sdl,$(basename $(notdir $(wildcard src/*.cpp))))
 GLBINARIES:=$(filter %-glut,$(basename $(notdir $(wildcard src/*.cpp))))
 JSBINARIES:=$(addsuffix .js,$(BINARIES))
 TESTBINARIES:=$(filter test-%,$(BINARIES))