some linux compilation fixes..

Former-commit-id: 5527a26086f75deeadda6fbe332318412b1c89ce

Makefile.conf

@@ -165,7 +165,17 @@ ifeq ($(IGL_USERNAME),stefanmessmer)
 	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
 
-
+ifeq ($(IGL_USERNAME),wenzel)
+	IGL_WITH_TETGEN=0
+	IGL_WITH_MATLAB=0
+	IGL_WITH_MOSEK=0
+	OPENGL_LIB=-lGL -lGLU
+	GLUT_LIB=-lglut
+	ANTTWEAKBAR_LIB=-lAntTweakBar
+	IGL_WITH_PNG=1
+	OPENMP=-fopenmp
+	CFLAGS += -msse4 -D__SSE4__ -DIGL_NO_MOSEK
+endif
 
 #############################################################################
 # DEFAULTS (USUALLY TO SOMETHING THAT WORKS FOR SURE ON MAC OS X

examples/arap/Makefile

@@ -24,10 +24,11 @@ EMBREE_LIB=-L$(EMBREE)/bin -lembree -lsys
 # YIMAGE Library
 YIMG=$(LIBIGL)/external/yimg/
 YIMG_LIB=-L$(YIMG) -lyimg -lz -L/usr/X11/lib -lpng -bind_at_load
-YIMG_INC=-I/usr/X11/include -I$(YIMG) 
+YIMG_INC=-I/usr/X11/include -I$(YIMG)
 
 ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
 ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
+
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(YIMG_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(YIMG_LIB)
 

examples/camera/example.cpp

@@ -18,10 +18,10 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#ifdef WIN32
-#include <GL/glut.h>
-#else
+#ifdef __APPLE__
 #include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
 #endif
 
 #include <vector>
@@ -509,30 +509,38 @@ void mouse(int glutButton, int glutState, int mouse_x, int mouse_y)
         break;
       }
       break;
-      // Scroll down
-      case GLUT_WHEEL_DOWN:
-      {
-        mouse_wheel(0,-1,mouse_x,mouse_y);
-        break;
-      }
-      // Scroll up
-      case GLUT_WHEEL_UP:
-      {
-        mouse_wheel(0,1,mouse_x,mouse_y);
-        break;
-      }
-      // Scroll left
-      case GLUT_WHEEL_LEFT:
-      {
-        mouse_wheel(1,-1,mouse_x,mouse_y);
-        break;
-      }
-      // Scroll right
-      case GLUT_WHEEL_RIGHT:
-      {
-        mouse_wheel(1,1,mouse_x,mouse_y);
-        break;
-      }
+#ifdef GLUT_WHEEL_DOWN
+    // Scroll down
+    case GLUT_WHEEL_DOWN:
+    {
+      mouse_wheel(0,-1,mouse_x,mouse_y);
+      break;
+    }
+#endif
+#ifdef GLUT_WHEEL_UP
+    // Scroll up
+    case GLUT_WHEEL_UP:
+    {
+      mouse_wheel(0,1,mouse_x,mouse_y);
+      break;
+    }
+#endif
+#ifdef GLUT_WHEEL_LEFT
+    // Scroll left
+    case GLUT_WHEEL_LEFT:
+    {
+      mouse_wheel(1,-1,mouse_x,mouse_y);
+      break;
+    }
+#endif
+#ifdef GLUT_WHEEL_RIGHT
+    // Scroll right
+    case GLUT_WHEEL_RIGHT:
+    {
+      mouse_wheel(1,1,mouse_x,mouse_y);
+      break;
+    }
+#endif
     }
   }
 }

examples/flare-eyes/example.cpp

@@ -29,9 +29,12 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+#ifdef __APPLE__
 #include <GLUT/glut.h>
-
 #include <Carbon/Carbon.h>
+#else
+#include <GL/glut.h>
+#endif
 
 #include <string>
 #include <vector>
@@ -427,30 +430,38 @@ void mouse(int glutButton, int glutState, int mouse_x, int mouse_y)
       }
       break;
     }
+#ifdef GLUT_WHEEL_DOWN
     // Scroll down
     case GLUT_WHEEL_DOWN:
     {
       mouse_wheel(0,-1,mouse_x,mouse_y);
       break;
     }
+#endif
+#ifdef GLUT_WHEEL_UP
     // Scroll up
     case GLUT_WHEEL_UP:
     {
       mouse_wheel(0,1,mouse_x,mouse_y);
       break;
     }
+#endif
+#ifdef GLUT_WHEEL_LEFT
     // Scroll left
     case GLUT_WHEEL_LEFT:
     {
       mouse_wheel(1,-1,mouse_x,mouse_y);
       break;
     }
+#endif
+#ifdef GLUT_WHEEL_RIGHT
     // Scroll right
     case GLUT_WHEEL_RIGHT:
     {
       mouse_wheel(1,1,mouse_x,mouse_y);
       break;
     }
+#endif
   }
 }
 

examples/patches/example.cpp

@@ -35,10 +35,10 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#ifdef WIN32
-#include <GL/glut.h>
-#else
+#ifdef __APPLE__
 #include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
 #endif
 
 #ifndef GLUT_WHEEL_UP

examples/randomly-sample-mesh/example.cpp

@@ -26,7 +26,11 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+#ifdef __APPLE__
 #include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
+#endif
 
 #include <string>
 #include <vector>

examples/rotate-widget/example.cpp

@@ -27,7 +27,11 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#include <GLUT/glut.h>
+#if defined(__APPLE__)
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
 
 #include <string>
 #include <vector>

examples/scene-rotation/example.cpp

@@ -30,9 +30,12 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+#ifdef __APPLE__
 #include <GLUT/glut.h>
-
 #include <Carbon/Carbon.h>
+#else
+#include <GL/glut.h>
+#endif
 
 #include <string>
 #include <vector>

examples/shadow-mapping/example.cpp

@@ -36,10 +36,10 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
-#ifdef WIN32
-#include <GL/glut.h>
-#else
+#if defined(__APPLE__)
 #include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
 #endif
 
 #ifndef GLUT_WHEEL_UP

examples/skeleton/example.cpp

@@ -34,7 +34,12 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+#ifdef __APPLE__
 #include <GLUT/glut.h>
+#include <Carbon/Carbon.h>
+#else
+#include <GL/glut.h>
+#endif
 
 #include <string>
 #include <vector>

examples/upright/example.cpp

@@ -28,7 +28,11 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 
+#ifdef __APPLE__
 #include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
+#endif
 
 #include <Carbon/Carbon.h>
 

include/igl/mvc.cpp

@@ -119,7 +119,7 @@ IGL_INLINE void igl::mvc(const Eigen::MatrixXd &V, const Eigen::MatrixXd &C, Eig
   
   // vectors from V to every C, where CmV(i,j,:) is the vector from domain
   // vertex j to handle i
-  double EPSILON = 1e-10;
+  double EPS = 1e-10;
   Eigen::MatrixXd WW = Eigen::MatrixXd(C1.rows(), V1.rows());
   Eigen::MatrixXd dist_C_V (C1.rows(), V1.rows());
   std::vector< std::pair<int,int> > on_corner(0);
@@ -145,7 +145,7 @@ IGL_INLINE void igl::mvc(const Eigen::MatrixXd &V, const Eigen::MatrixXd &C, Eig
       // mean value coordinates
       WW(i,j) = (std::tan(a_prev/2.0) + std::tan(a_next/2.0)) / dist_C_V(i,j);
       
-      if (dist_C_V(i,j) < EPSILON)
+      if (dist_C_V(i,j) < EPS)
         on_corner.push_back(std::make_pair(j,i));
       else
         // only in case of no-corner (no need for checking for multiple segments afterwards --
@@ -153,7 +153,7 @@ IGL_INLINE void igl::mvc(const Eigen::MatrixXd &V, const Eigen::MatrixXd &C, Eig
         // handled that)
         // domain vertex j is on the segment from i to i+1 if the distances from vj to
         // pi and pi+1 are about 
-        if(abs((dist_C_V(i,j) + dist_C_V_next) / edge_length - 1) < EPSILON)
+        if(abs((dist_C_V(i,j) + dist_C_V_next) / edge_length - 1) < EPS)
           on_segment.push_back(std::make_pair(j,i));
       
     }