Merge branch 'master' of github.com:libigl/libigl

Former-commit-id: 30f3fba5be2e3c7c95232fe62d81531e47f9dfc7

include/igl/readDMAT.cpp

@@ -45,7 +45,8 @@ static inline int readDMAT_read_header(FILE * fp, int & num_rows, int & num_cols
   }
   // finish reading header
   char lf;
-  if(fread(&lf, sizeof(char), 1, fp)!=1 || lf != '\n')
+
+  if(fread(&lf, sizeof(char), 1, fp)!=1 || !(lf == '\n' || lf == '\r'))
   {
     fprintf(stderr,"IOError: bad line ending in header\n");
     return 4;

tutorial/CMakeLists.txt

@@ -12,7 +12,7 @@ endif(LIBIGL_USE_STATIC_LIBRARY)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 IF(MSVC)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") ### Enable parallel compilation for Visual Studio
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /bigobj") ### Enable parallel compilation for Visual Studio
   SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR} )
   SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR} )
 ELSE(MSVC)