minor stuff

Former-commit-id: 54a3af872cd24e2a8b6a252bdae8df790ba41ec2

Makefile.conf

@@ -108,9 +108,11 @@ ifeq ($(IGL_USERNAME),daniele)
 endif
 
 ifeq ($(IGL_USERNAME),olkido)
-        IGL_WITH_MATLAB=1
+    IGL_WITH_MATLAB=1
 	IGL_WITH_XML=1
-        AFLAGS= -m64
+    AFLAGS= -m64
+    IGL_WITH_EMBREE=1
+    IGL_WITH_PNG=1
 endif
 
 ifeq ($(IGL_USERNAME),chrsch)

include/igl/xml/XMLSerializer.h.REMOVED.git-id

@@ -1 +1 @@
-ef40e013b092c2c55d5032d93ad436ea05230a88
+87be0c90ddc68b0d6ed33e48525023625f38c531