linux compilation fixes

Former-commit-id: 44a8b360466d224f6084d140d3b9da44b895b8d5

include/igl/comiso/miq.cpp

@@ -572,11 +572,11 @@ namespace igl {
 
     IGL_INLINE bool updateStiffeningJacobianDistorsion(double grad_size, const Eigen::MatrixXd& WUV);
 
-    IGL_INLINE IGL_INLINE bool IsFlipped(const Eigen::Vector2d &uv0,
+    IGL_INLINE bool IsFlipped(const Eigen::Vector2d &uv0,
                           const Eigen::Vector2d &uv1,
                           const Eigen::Vector2d &uv2);
 
-    IGL_INLINE IGL_INLINE bool IsFlipped(const int i, const Eigen::MatrixXd& WUV);
+    IGL_INLINE bool IsFlipped(const int i, const Eigen::MatrixXd& WUV);
 
   };
 };

include/igl/principal_curvature.cpp

@@ -823,7 +823,7 @@ IGL_INLINE void igl::principal_curvature(
     PD1.row(i).normalize();
     PD2.row(i).normalize();
 
-    if (isnan(PD1(i,0)) || isnan(PD1(i,1)) || isnan(PD1(i,2)) || isnan(PD2(i,0)) || isnan(PD2(i,1)) || isnan(PD2(i,2)))
+    if (std::isnan(PD1(i,0)) || std::isnan(PD1(i,1)) || std::isnan(PD1(i,2)) || std::isnan(PD2(i,0)) || std::isnan(PD2(i,1)) || std::isnan(PD2(i,2)))
     {
       PD1.row(i) << 0,0,0;
       PD2.row(i) << 0,0,0;

include/igl/viewer/Viewer.cpp

@@ -4,6 +4,9 @@
 #  include <windows.h>
 #  undef max
 #  undef min
+#endif
+
+#ifndef __APPLE__
 #  include <GL/glew.h>
 #endif
 
@@ -2374,9 +2377,10 @@ namespace igl
     glfwWindowHint(GLFW_SAMPLES, 16);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+    #ifdef __APPLE__
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-
+    #endif
     window = glfwCreateWindow(1280, 800, "IGL Viewer", NULL, NULL);
     if (!window)
     {
@@ -2386,7 +2390,7 @@ namespace igl
 
 	glfwMakeContextCurrent(window);
 
-#ifdef _WIN32
+#ifndef __APPLE__
 	glewExperimental = true;
 	GLenum err = glewInit();
 	if (GLEW_OK != err)

tutorial/CMakeLists.shared

@@ -13,21 +13,26 @@ find_package(EIGEN REQUIRED)
 find_package(LIBIGL REQUIRED)
 find_package(GLFW REQUIRED)
 
-if(WIN32)
+if(NOT APPLE)
 	find_package(GLEW REQUIRED)
-endif(WIN32)
+endif(NOT APPLE)
 
 if(APPLE)
 	set(CMAKE_CXX_LINK_FLAGS "-framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo")
 endif (APPLE) #APPLE
 
+if(UNIX AND NOT APPLE)
+  set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lGL -lGLU -lrt -lX11 -lXxf86vm -lXrandr -lpthread -lXi")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+endif(UNIX AND NOT APPLE)
+
 include_directories( ${ANT_TWEAK_BAR_INCLUDE_DIR} )
 
 # message(FATAL_ERROR ${ANT_TWEAK_BAR_INCLUDE_DIR})
 
-if(WIN32)
+if(NOT APPLE)
 	include_directories( ${GLEW_INCLUDE_DIR} )
-endif(WIN32)
+endif(NOT APPLE)
 
 include_directories( ${EIGEN_INCLUDE_DIR})
 include_directories( ${LIBIGL_INCLUDE_DIR})
@@ -59,9 +64,9 @@ endif()
 
 set(SHARED_SOURCES ${LIBIGL_SOURCES})
 
-if(WIN32)
+if(NOT APPLE)
 	set(SHARED_SOURCES ${SHARED_SOURCES} ${GLEW_SOURCES})
-endif(WIN32)
+endif(NOT APPLE)
 
 # message(FATAL_ERROR ${LIBIGL_SOURCES})
 

tutorial/cmake/FindLIBCOMISO.cmake

@@ -12,11 +12,18 @@ FIND_PATH(LIBCOMISO_INCLUDE_DIR CoMISo/Solver/ConstrainedSolver.hh
    $ENV{LIBCOMISO_ROOT}/include
    $ENV{LIBCOMISO_DIR}/include
    $ENV{LIBCOMISO_DIR}/inc
+   ${PROJECT_SOURCE_DIR}/../
+   ${PROJECT_SOURCE_DIR}/../../
+   ${PROJECT_SOURCE_DIR}/../../../
    ${PROJECT_SOURCE_DIR}/../CoMISo/
    ${PROJECT_SOURCE_DIR}/../CoMISo/include
+   ${PROJECT_SOURCE_DIR}/../../CoMISo/
+   ${PROJECT_SOURCE_DIR}/../../CoMISo/include
    /Users/daniele/Dropbox/igl/MIQ/src
 )
 
+#message(FATAL_ERROR "${LIBCOMISO_INCLUDE_DIR}")
+
 FIND_LIBRARY(LIBCOMISO_LIBRARY NAMES CoMISo
   PATHS
     /usr/local
@@ -24,8 +31,11 @@ FIND_LIBRARY(LIBCOMISO_LIBRARY NAMES CoMISo
     /usr
     /
     ${PROJECT_SOURCE_DIR}/../CoMISo/
-    ${PROJECT_SOURCE_DIR}/../CoMISo/build
-    /Users/daniele/Dropbox/igl/MIQ/src/CoMISo/build
+    ${PROJECT_SOURCE_DIR}/../CoMISo/build/Build/lib/CoMISo/
+    ${PROJECT_SOURCE_DIR}/../../CoMISo/
+    ${PROJECT_SOURCE_DIR}/../../CoMISo/build/Build/lib/CoMISo/
+    ${PROJECT_SOURCE_DIR}/../../../CoMISo/
+    ${PROJECT_SOURCE_DIR}/../../../CoMISo/build/Build/lib/CoMISo/
 )
 
 if(LIBCOMISO_INCLUDE_DIR AND LIBCOMISO_LIBRARY)