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

Former-commit-id: edbb5c3bfadd6145f6d3bfa4bd1b04d17d97b133

optional/README.md

@@ -32,16 +32,8 @@ You should expect to see a few linker warnings of the form:
 These are (admittedly unpopular) functions that have never been used by us
 statically so we haven't explicit instantiations (yet).
 
-
-#### Examples ####
-You can make a slew of examples by issuing:
-
-    cd ../examples
-    make
-
 #### External ####
 
-
 Finally there are a number of external libraries that we include in
 `./external/` because they are either difficult to obtain or they have been
 patched for easier use with libigl. Please see the respective readmes in those
@@ -266,7 +258,7 @@ Here's a tiny test example using `igl.h` and `igl.cpp`. Save the following in `t
     {
     Eigen::MatrixXd V;
     Eigen::MatrixXi F;
-    return (argc>=2 && igl::read_triangle_mesh(argv[1],V,F)?0:1);
+    return (argc>=2 && igl::read_triangle_mesh(argv[1],V,F)?0:1);
     }
 
 Then compile `igl.cpp` with:

shared/cmake/CMakeLists.txt

@@ -271,7 +271,7 @@ if(LIBIGL_WITH_VIEWER)
   endif()
 
   ### GLEW for linux and windows
-  if((UNIX AND NOT APPLE) OR (WIN32 AND NOT LIBIGL_WITH_NANOGUI)) ### Compile glew if needed
+  if((UNIX AND NOT APPLE) OR WIN32) ### Compile glew if needed
     set(GLEW_INSTALL OFF CACHE BOOL " " FORCE)
     add_subdirectory("${NANOGUI_DIR}/ext/glew" "glew")
   endif()