Automated merge with bundle:/var/folders/9k/qfm7p3rx3kl_v5n0_1xhy0680000gn/T/SourceTreeTemp.WYqaUi

Former-commit-id: 11d3e308045a17c1f5e932382d343308e92564f4

Makefile

@@ -51,6 +51,10 @@ ifeq ($(IGL_WITH_BOOST),1)
 	EXTRA_DIRS+=include/igl/boost
 	EXTRAS += boost
 endif
+ifeq ($(IGL_WITH_SVD3X3),1)
+	EXTRA_DIRS+=include/igl/svd3x3
+	EXTRAS += svd3x3
+endif
 
 .PHONY: examples
 .PHONY: extras

Makefile.conf

@@ -130,13 +130,15 @@ ifeq ($(IGL_USERNAME),stefanmessmer)
 	IGL_WITH_PNG=0
 	IGL_WITH_XML=0
 	IGL_WITH_BOOST=0
+	IGL_WITH_SVD3X3=1
 	#OPENGL_INC=-I$(DEFAULT_PREFIX)/include
 	#OPENGL_LIB=-lGL -lGLU
 	# Glut is needed only for examples
 	#GLUT_LIB=-lglut
 	#ANTTWEAKBAR_LIB=-lAntTweakBar
 	OPENPMP = -openmp
-	AFLAGS= -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENGL -arch armv7s -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk
+	AFLAGS = -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENGL -arch armv7s -arch armv7 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk
+	AFLAGS_SIMULATOR = -DIGL_NO_MOSEK -DIGL_NO_ANTTWEAKBAR -DIGL_NO_OPENG -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk
 endif
 
 

include/igl/svd3x3/polar_svd3x3.cpp

@@ -100,5 +100,8 @@ IGL_INLINE void igl::polar_svd3x3_avx(const Eigen::Matrix<T, 3*8, 3>& A, Eigen::
 #ifndef IGL_HEADER_ONLY
 // Explicit template instanciation
 template void igl::polar_svd3x3<Eigen::Matrix<double, 3, 3, 0, 3, 3> >(Eigen::Matrix<double, 3, 3, 0, 3, 3> const&, Eigen::Matrix<double, 3, 3, 0, 3, 3>&);
+
+#ifdef __SSE__
 template void igl::polar_svd3x3_sse<float>(Eigen::Matrix<float, 12, 3, 0, 12, 3> const&, Eigen::Matrix<float, 12, 3, 0, 12, 3>&);
 #endif
+#endif