|
|
@@ -116,15 +116,15 @@ endif
|
|
|
|
|
|
ifeq ($(IGL_USERNAME),olkido)
|
|
|
IGL_WITH_MATLAB=1
|
|
|
- IGL_WITH_COMISO=1
|
|
|
- IGL_WITH_XML=1
|
|
|
- COMISO=/Users/olkido/Documents/igl/MIQ/src/CoMISo
|
|
|
+ IGL_WITH_COMISO=1
|
|
|
+ IGL_WITH_XML=1
|
|
|
+ COMISO=/Users/olkido/Documents/igl/MIQ/src/CoMISo
|
|
|
IGL_WITH_XML=1
|
|
|
AFLAGS= -m64
|
|
|
IGL_WITH_EMBREE=1
|
|
|
IGL_WITH_PNG=1
|
|
|
- IGL_WITH_VIEWER=1
|
|
|
- MATLAB=/Applications/MATLAB_R2014b.app/
|
|
|
+ IGL_WITH_VIEWER=1
|
|
|
+ MATLAB=/Applications/MATLAB_R2014b.app/
|
|
|
endif
|
|
|
|
|
|
ifeq ($(IGL_USERNAME),chrsch)
|
|
|
@@ -221,24 +221,24 @@ ifndef ANTTWEAKBAR_LIB
|
|
|
endif
|
|
|
|
|
|
ifndef SINGULAR_VALUE_DECOMPOSITION_INC
|
|
|
- SINGULAR_VALUE_DECOMPOSITION_INC=\
|
|
|
- -I$(LIBIGL)/external/Singular_Value_Decomposition/
|
|
|
+ SINGULAR_VALUE_DECOMPOSITION_INC=\
|
|
|
+ -I$(LIBIGL)/external/Singular_Value_Decomposition/
|
|
|
endif
|
|
|
|
|
|
ifndef TETGEN
|
|
|
# By default I'm using the libigl version. Adjust accordingly
|
|
|
- TETGEN=$(LIBIGL)/external/tetgen
|
|
|
- TETGEN_LIB=-L$(TETGEN) -ligltetgen -ltet
|
|
|
- TETGEN_INC=-I$(TETGEN)
|
|
|
+ TETGEN=$(LIBIGL)/external/tetgen
|
|
|
+ TETGEN_LIB=-L$(TETGEN) -ligltetgen -ltet
|
|
|
+ TETGEN_INC=-I$(TETGEN)
|
|
|
endif
|
|
|
|
|
|
ifndef EMBREE
|
|
|
- EMBREE=$(LIBIGL)/external/embree
|
|
|
- EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
|
|
|
- EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
|
|
|
+ EMBREE=$(LIBIGL)/external/embree
|
|
|
+ EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
|
|
|
+ EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
|
|
|
endif
|
|
|
ifndef YIMG
|
|
|
- YIMG=$(LIBIGL)/external/yimg
|
|
|
- YIMG_LIB=-L$(YIMG) -lyimg -lz -L/usr/X11/lib -L$(DEFAULT_PREFIX)/lib -lpng -bind_at_load
|
|
|
- YIMG_INC=-I/usr/X11/include -I$(YIMG)
|
|
|
+ YIMG=$(LIBIGL)/external/yimg
|
|
|
+ YIMG_LIB=-L$(YIMG) -lyimg -lz -L/usr/X11/lib -L$(DEFAULT_PREFIX)/lib -lpng -bind_at_load
|
|
|
+ YIMG_INC=-I/usr/X11/include -I$(YIMG)
|
|
|
endif
|
Alec Jacobson