added olga s's settings to Makefile.conf

Former-commit-id: 6a5296d2467ec9388d29bf93596603ed5d675836

Makefile

@@ -54,13 +54,15 @@ INC+=-Iinclude/
 #############################################################################
 # DEPENDENCIES
 #############################################################################
+INC+=$(OPENGL_INC)
 
 # Eigen dependency
-EIGEN3_INC=-I$(OPT)/local/include/eigen3 -I$(OPT)/local/include/eigen3/unsupported
+EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 INC+=$(EIGEN3_INC)
 
 # AntTweakBar dependency
-ANTTWEAKBAR_INC=-I$(OPT)/local/include
+#ANTTWEAKBAR_INC=-I$(DEFAULT_PREFIX)/include
+ANTTWEAKBAR_INC=-Iexternal/AntTweakBar/include
 INC+=$(ANTTWEAKBAR_INC)
 
 ## OpenGL dependency

Makefile.conf

@@ -6,9 +6,9 @@ UNAME := $(shell uname)
 CFLAGS += -Wall
 
 ifeq ($(UNAME), Linux)
-	OPT = /usr/
+	DEFAULT_PREFIX = /usr/local/
 else
-	OPT = /opt/
+	DEFAULT_PREFIX = /opt/local/
 	# I guess arch only works in Mac OSX
 	AFLAGS += -arch x86_64 -m64
 endif
@@ -26,6 +26,20 @@ ifeq ($(IGL_USERNAME),ajx)
 	IGL_WITH_MATLAB=1
 	IGL_WITH_MOSEK=1
 	IGL_WITH_PNG=1
+	# I don't use llvm
+	AFLAGS=-m64
+endif
+
+ifeq ($(IGL_USERNAME),alecjaco) 
+	DEFAULT_PREFIX=/home1/alecjaco/
+	#MOSEKPLATFORM=linux64x86
+	IGL_WITH_TETGEN=1
+	IGL_WITH_MATLAB=0
+	#IGL_WITH_MOSEK=1
+	OPENGL_INC=-I$(DEFAULT_PREFIX)/include
+	OPENGL_LIB=-lGL -lGLU
+	#GLUT_LIB=-lglut
+	ANTTWEAKBAR_LIB=-lAntTweakBar
 endif
 
 ifeq ($(IGL_USERNAME),sorkineo)
@@ -45,6 +59,7 @@ ifeq ($(IGL_USERNAME),jalec_linux)
 	GLUT_LIB=-lglut
 	ANTTWEAKBAR_LIB=-lAntTweakBar
 endif
+
 ifeq ($(IGL_USERNAME),daniele)
 	IGL_WITH_MATLAB=1
 endif

include/igl/draw_mesh.h

@@ -12,7 +12,9 @@
 #    include <Windows.h>
 #    undef NOMINMAX
 #  endif
+#  define GL_GLEXT_PROTOTYPES
 #  include <GL/gl.h>
+#  include <GL/glext.h>
 #endif
 
 namespace igl

include/igl/matlab/Makefile

@@ -17,7 +17,7 @@ INC+=-I../../../include/
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
 # Eigen dependency
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
+EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 INC+=$(EIGEN3_INC)
 
 # Matlab dependency

include/igl/mosek/Makefile

@@ -20,7 +20,7 @@ INC+=-I../../../include/
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
 # Eigen dependency
-EIGEN3_INC=-I$(OPT)/local/include/eigen3 -I$(OPT)/local/include/eigen3/unsupported
+EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 INC+=$(EIGEN3_INC)
 
 # mosek dependency

include/igl/render_to_tga.cpp

@@ -1,5 +1,6 @@
 #include "render_to_tga.h"
 #include "tga.h"
+#include <cstdlib>
 
 IGL_INLINE bool igl::render_to_tga(
   const std::string tga_file,

include/igl/tetgen/Makefile

@@ -19,7 +19,7 @@ INC+=-I../../../include/
 # EXPECTS THAT CFLAGS IS ALREADY SET APPROPRIATELY 
 
 # Eigen dependency
-EIGEN3_INC=-I$(OPT)/local/include/eigen3 -I$(OPT)/local/include/eigen3/unsupported
+EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 INC+=$(EIGEN3_INC)
 
 # Tetgen dependency

include/igl/tga.h

@@ -10,11 +10,9 @@
 #endif
 
 #ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <GLUT/glut.h>
+#  include <OpenGL/gl.h>
 #else
-#include <GL/gl.h>
-#include <GL/glut.h>
+#  include <GL/gl.h>
 #endif
 
 namespace igl