소스 검색

use common makefile

Former-commit-id: 4afaf06dbaeeb37c58309675515f4257c2845565
Alec Jacobson 10 년 전
부모
커밋
d30bc9a420
49개의 변경된 파일96개의 추가작업 그리고 579개의 파일을 삭제
  1. 3 8
      examples/MatlabWorkspace/Makefile
  2. 2 7
      examples/ReAntTweakBar/Makefile
  3. 2 6
      examples/affine/Makefile
  4. 1 9
      examples/ambient-occlusion/Makefile
  5. 1 31
      examples/arap/Makefile
  6. 0 1
      examples/arap/example.cpp
  7. 1 13
      examples/bbw/Makefile
  8. 0 17
      examples/beach-balls/Makefile
  9. 2 26
      examples/camera/Makefile
  10. 0 13
      examples/colored-mesh/Makefile
  11. 2 6
      examples/dmat/Makefile
  12. 4 8
      examples/eigen-gotchas/Makefile
  13. 0 1
      examples/eigen-gotchas/example.cpp
  14. 0 15
      examples/embree/Makefile
  15. 4 7
      examples/example_fun/Makefile
  16. 2 5
      examples/file_contents_as_string/Makefile
  17. 0 21
      examples/flare-eyes/Makefile
  18. 2 5
      examples/get_seconds/Makefile
  19. 2 3
      examples/glslversion/Makefile
  20. 5 5
      examples/glut_speed_test/Makefile
  21. 4 8
      examples/harwell_boeing/Makefile
  22. 1 13
      examples/intersections/Makefile
  23. 2 5
      examples/is_dir/Makefile
  24. 2 6
      examples/marching_cubes/Makefile
  25. 2 6
      examples/meshio/Makefile
  26. 2 6
      examples/mode/Makefile
  27. 1 8
      examples/multi-viewport/Makefile
  28. 3 23
      examples/patches/Makefile
  29. 2 5
      examples/path_tests/Makefile
  30. 2 5
      examples/pathinfo/Makefile
  31. 2 6
      examples/quicklook-mesh/Makefile
  32. 2 24
      examples/randomly-sample-mesh/Makefile
  33. 3 10
      examples/render_to_png/Makefile
  34. 2 23
      examples/rotate-widget/Makefile
  35. 2 23
      examples/scene-rotation/Makefile
  36. 2 26
      examples/shadow-mapping/Makefile
  37. 3 46
      examples/skeleton-builder/Makefile
  38. 4 31
      examples/skeleton-posing/Makefile
  39. 3 25
      examples/skeleton/Makefile
  40. 2 6
      examples/slice/Makefile
  41. 2 5
      examples/sort/Makefile
  42. 2 6
      examples/sortrows/Makefile
  43. 2 3
      examples/stdin_to_temp/Makefile
  44. 2 3
      examples/svd/Makefile
  45. 1 14
      examples/textured-mesh/Makefile
  46. 2 4
      examples/trackball/Makefile
  47. 2 14
      examples/transparency/Makefile
  48. 2 6
      examples/transpose_blocks/Makefile
  49. 2 12
      examples/upright/Makefile

+ 3 - 8
examples/MatlabWorkspace/Makefile

@@ -2,18 +2,13 @@
 
 # Shared flags etc.
 include ../../build/Makefile.conf
-
-IGL=../../
-IGL_LIB=-L$(IGL)/lib -ligl
-IGL_INC=-I$(IGL)/include
-
-EIGEN3_INC=-I/usr/local/include/eigen3 -I/usr/local/include/eigen3/unsupported -I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
+LIBIGL_LIB+=-liglmatlab
 
 MATLAB_INC=-I$(MATLAB)/extern/include/
 MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat
 
-LIB+=$(IGL_LIB) $(MATLAB_LIB)
-INC+=$(IGL_INC) $(EIGEN3_INC) $(MATLAB_INC)
+LIB+=$(LIBIGL_LIB) $(MATLAB_LIB)
+INC+=$(LIBIGL_INC) $(EIGEN3_INC) $(MATLAB_INC)
 
 CFLAGS += -g
 

+ 2 - 7
examples/ReAntTweakBar/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,8 @@ all: example
 
 .PHONY: example
 
-IGL=../../
-
-ANTTWEAKBAR_INC=-I$(IGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(IGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-inc=-DIGL_HEADER_ONLY -I$(IGL)/include -I$(DEFAULT_PREFIX)/include $(ANTTWEAKBAR_INC)
-lib=-L$(IGL)/lib -ligl -L$(DEFAULT_PREFIX)/lib $(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB)
+inc=$(LIBIGL_INC) $(ANTTWEAKBAR_INC)
+lib=$(LIBIGL_LIB) $(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB)
 CFLAGS+=-g
 
 example: example.o

+ 2 - 6
examples/affine/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 all: example
@@ -8,12 +7,9 @@ include ../../build/Makefile.conf
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 1 - 9
examples/ambient-occlusion/Makefile

@@ -1,25 +1,17 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglembree
 
 all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
 EMBREE=$(LIBIGL)/external/embree
 EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
 EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
 
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB)
 

+ 1 - 31
examples/arap/Makefile

@@ -1,43 +1,13 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglsvd3x3
 
 all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglpng -liglsvd3x3
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-#CFLAGS+=-DIGL_HEADER_ONLY
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-# YIMAGE Library
-YIMG=$(LIBIGL)/external/yimg/
-YIMG_LIB=-L$(YIMG) -lyimg -lz -L/opt/local/lib -lpng
-YIMG_INC=-I/usr/X11/include -I$(YIMG)
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar
-UNAME := $(shell uname)
-# Apple needs to load the AppKit framework for anttweakbar and maybe bind at
-# load for png
-ifeq ($(UNAME), Darwin)
-	YIMG_LIB+=-bind_at_load
-	ANTTWEAKBAR_LIB+=-framework AppKit
-endif
-
-# SVD 
-SINGULAR_VALUE_DECOMPOSITION_INC=\
-	-I$(LIBIGL)/external/Singular_Value_Decomposition/
-
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(YIMG_INC) $(SINGULAR_VALUE_DECOMPOSITION_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(YIMG_LIB) 
 

+ 0 - 1
examples/arap/example.cpp

@@ -34,7 +34,6 @@
 #include <igl/get_seconds.h>
 #include <igl/PI.h>
 #include <igl/STR.h>
-#include <YImage.hpp>
 
 #ifdef __APPLE__
 #  include <GLUT/glut.h>

+ 1 - 13
examples/bbw/Makefile

@@ -2,9 +2,7 @@ include ../../build/Makefile.conf
 
 CXX=g++
 
-LIBIGL=../../
-LIBIGL_INC=-I${LIBIGL}/include
-LIBIGL_LIB=-L${LIBIGL}/lib -ligl -liglmosek -liglbbw
+LIBIGL_LIB+=-liglmosek -liglbbw -ligltetgen
 
 ifdef IGL_NO_MOSEK
 CFLAGS+=-DIGL_NO_MOSEK
@@ -16,22 +14,12 @@ endif
 ifndef MOSEKVERSION
   MOSEKVERSION=6
 endif
-IGLMOSEK=../mosek/
-IGLMOSEK_INC=-I$(IGLMOSEK)/
-INC+=${IGLMOSEK_INC}
 MOSEK=/usr/local/mosek
 MOSEK_INC=-I$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/h
 MOSEK_LIB=-L$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/bin -lmosek64
 INC+=$(MOSEK_INC)
 endif
 
-EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-
-# By default I'm using the libigl version. Adjust accordingly
-TETGEN=$(LIBIGL)/external/tetgen
-TETGEN_LIB=-L$(TETGEN) -ligltetgen -ltet 
-TETGEN_INC=-I$(TETGEN)
-
 INC=-I. ${EIGEN3_INC} ${LIBIGL_INC} ${TETGEN_INC} ${MOSEK_INC} 
 LIB=${TETGEN_LIB} ${MOSEK_LIB} ${OPENGL_LIB} ${GLUT_LIB} ${LIBIGL_LIB} 
 

+ 0 - 17
examples/beach-balls/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -10,22 +9,6 @@ all: obj example
 
 CFLAGS+=-g -std=c++11
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-# Use free glut for mouse scrolling
-GLUT_LIB=-framework GLUT
-GLUT_INC=-framework GLUT
-
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 

+ 2 - 26
examples/camera/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,31 +7,8 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-CARBON_LIB=-framework Carbon
-
-## Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-#GLUT_LIB=$(FREE_GLUT_LIB)
-#GLUT_INC=$(FREE_GLUT_INC)
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 0 - 13
examples/colored-mesh/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,18 +7,6 @@ all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB)
 

+ 2 - 6
examples/dmat/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 4 - 8
examples/eigen-gotchas/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,18 +7,15 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include $(eigen)
-lib=-L$(igl_lib)/lib -ligl
+INC=$(LIBIGL_INC) $(EIGEN3_INC)
+LIB=$(LIBIGL_LIB)
 
 example: example.o
-	g++ $(CFLAGS) -o example example.o $(lib)
+	g++ $(CFLAGS) -o example example.o $(LIB)
 
 example.o: example.cpp
-	g++ $(CFLAGS) -c example.cpp -o example.o $(inc)
+	g++ $(CFLAGS) -c example.cpp -o example.o $(INC)
 clean:
 	rm -f example.o
 	rm -f example

+ 0 - 1
examples/eigen-gotchas/example.cpp

@@ -4,7 +4,6 @@
 #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
 #define EIGEN_IM_MAD_AS_HELL_AND_IM_NOT_GOING_TO_TAKE_IT_ANYMORE
 #include <Eigen/Sparse>
-#include <Eigen/SparseExtra>
 using namespace Eigen;
 
 #include <cstdio>

+ 0 - 15
examples/embree/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,20 +7,6 @@ all: example
 
 .PHONY: example
 
-LIBIGL=../../
-#LIBIGL_INC=-I$(LIBIGL)/include -DIGL_HEADER_ONLY
-#LIBIGL_LIB=
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB)
 

+ 4 - 7
examples/example_fun/Makefile

@@ -5,26 +5,23 @@ all: example_static example_header_only
 # Shared flags etc.
 include ../../build/Makefile.conf
 
-igl_lib=../../
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
+INC=$(LIBIGL_INC)
 
-STATIC_LIB=-ligl -L../../lib
-HEADER_ONLY_DEF=-DIGL_HEADER_ONLY
+STATIC_LIB=-ligl -L../../lib -DIGL_STATIC_LIBRARY
 
 example_static: example_static.o
 	#g++ $(CFLAGS) -o example_static example_static.o $(lib) $(STATIC_LIB) ../../obj/example_fun.o
 	g++ $(CFLAGS) -o example_static example_static.o ../../obj/example_fun.o
 
 example_static.o: example.cpp
-	g++ $(CFLAGS) -c example.cpp -o example_static.o $(inc)
+	g++ $(CFLAGS) -c example.cpp -o example_static.o $(INC)
 
 example_header_only: example_header_only.o
 	g++ $(CFLAGS) -o example_header_only example_header_only.o $(lib)
 
 example_header_only.o: example.cpp
-	g++ $(CFLAGS) -c example.cpp -o example_header_only.o $(inc) $(HEADER_ONLY_DEF)
+	g++ $(CFLAGS) -c example.cpp -o example_header_only.o $(INC)
 
 clean:
 	rm -f example_static.o

+ 2 - 5
examples/file_contents_as_string/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,11 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 0 - 21
examples/flare-eyes/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,26 +7,6 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-CARBON_LIB=-framework Carbon
-
-## Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-#GLUT_LIB=$(FREE_GLUT_LIB)
-#GLUT_INC=$(FREE_GLUT_INC)
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
 

+ 2 - 5
examples/get_seconds/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,11 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-
 CFLAGS+=-g -Wall
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 3
examples/glslversion/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -11,8 +10,8 @@ all: example
 igl_lib=../../
 
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
-lib=$(OPENGL_LIB) $(GLUT_LIB) -L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(OPENGL_LIB) $(GLUT_LIB) $(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 5 - 5
examples/glut_speed_test/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 all: example
@@ -11,14 +10,15 @@ include ../../build/Makefile.conf
 igl_lib=../../
 
 CFLAGS+=-g -Wall 
-inc=-I$(igl_lib)/include
-lib=$(OPENGL_LIB) $(GLUT_LIB) -L$(igl_lib)/lib -ligl
+INC=$(LIBIGL_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(LIBIGL_LIB)
 
 example: example.o
-	g++ $(CFLAGS) -o example example.o $(lib)
+	g++ $(CFLAGS) -o example example.o $(LIB)
 
 example.o: example.cpp
-	g++ $(CFLAGS) $(deps) -c example.cpp -o example.o $(inc)
+	g++ $(CFLAGS) $(deps) -c example.cpp -o example.o $(INC)
+
 clean:
 	rm -f example.o
 	rm -f example

+ 4 - 8
examples/harwell_boeing/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,18 +7,15 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include $(eigen)
-lib=-L$(igl_lib)/lib -ligl
+INC=$(LIBIGL_INC) $(EIGEN3_INC)
+LIB=$(LIBIGL_LIB)
 
 example: example.o
-	g++ $(CFLAGS) -o example example.o $(lib)
+	g++ $(CFLAGS) -o example example.o $(LIB)
 
 example.o: example.cpp
-	g++ $(CFLAGS) -c example.cpp -o example.o $(inc)
+	g++ $(CFLAGS) -c example.cpp -o example.o $(INC)
 clean:
 	rm -f example.o
 	rm -f example

+ 1 - 13
examples/intersections/Makefile

@@ -1,31 +1,19 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB=+liglcgal
 
 all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree -liglcgal
-
 CGAL=/opt/local/
 CGAL_LIB=-L$(CGAL)/lib -lCGAL -lCGAL_Core -lgmp -lmpfr -lboost_thread-mt -lboost_system-mt
 CGAL_INC=-I$(CGAL)/include -I/usr/include/
 # This is absolutely necessary for Exact Construction
 CGAL_FLAGS=-frounding-math -fsignaling-nans 
 
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC) $(CGAL_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB) $(CGAL_LIB)
 CFLAGS+=$(CGAL_FLAGS)

+ 2 - 5
examples/is_dir/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,11 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 6
examples/marching_cubes/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 all: example
@@ -8,12 +7,9 @@ all: example
 # Shared flags etc.
 include ../../build/Makefile.conf
 
-igl_lib=../../
-eigen=-I$(DEFAULT_PREFIX)/include/eigen3
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include $(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 6
examples/meshio/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=-I$(DEFAULT_PREFIX)/include/eigen3
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include $(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 6
examples/mode/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3/
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 1 - 8
examples/multi-viewport/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -7,16 +6,10 @@ all: example
 
 .PHONY:  example
 
-LIBIGL=/usr/local/igl/libigl/
-include $(LIBIGL)/build/Makefile.conf
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
+include ../..//build/Makefile.conf
 
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
 CFLAGS+=-std=c++11 -g -Wno-deprecated-declarations
 
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 

+ 3 - 23
examples/patches/Makefile

@@ -1,8 +1,8 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglembree -liglboost
 
 all: obj example
 
@@ -10,28 +10,8 @@ all: obj example
 
 CFLAGS+=-g -std=c++11
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglmatlab -liglembree -liglboost
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-# Use free glut for mouse scrolling
-GLUT_LIB=-framework GLUT
-GLUT_INC=-framework GLUT
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC) $(EMBREE_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(EMBREE_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC) $(EMBREE_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 2 - 5
examples/path_tests/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,11 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-
 CFLAGS+=-g -Wall
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 5
examples/pathinfo/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 all: example
@@ -8,11 +7,9 @@ include ../../build/Makefile.conf
 
 .PHONY: example
 
-igl_lib=../../
-
 CFLAGS+=-g -Wall 
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib) 

+ 2 - 6
examples/quicklook-mesh/Makefile

@@ -10,13 +10,9 @@ C=clang
 #C=clang-mp-3.4
 CXXFLAGS += -stdlib=libc++ -std=c++11
 
-EIGEN=/opt/local/include/eigen3/
-EIGEN3_INC=-I$(EIGEN) -I$(EIGEN)/unsupported
-
+#Be sure that libs aren't used
 LIBIGL=../../
-#LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-LIBIGL_LIB=
-LIBIGL_INC=-DIGL_HEADER_ONLY -I $(LIBIGL)/include
+LIBIGL_INC=-I$(LIBIGL)/include
 
 # Do not use the GLU that comes with the macports Mesa:
 # http://www.alecjacobson.com/weblog/?p=2827

+ 2 - 24
examples/randomly-sample-mesh/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,29 +7,8 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglmatlab
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 3 - 10
examples/render_to_png/Makefile

@@ -1,17 +1,10 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglpng
 
 # YIMG dependency
-YIMG=../../external/yimg
-YIMG_LIB=-L$(YIMG) -lyimg -lz -L/usr/X11/lib -lpng -bind_at_load
-YIMG_INC=-I/usr/X11/include -I$(YIMG) 
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-# LIBPNG dependency
 
 all: example
 
@@ -19,8 +12,8 @@ all: example
 
 IGL=../../
 
-inc=-DIGL_HEADER_ONLY -I$(IGL)/include -I$(DEFAULT_PREFIX)/include $(YIMG_INC) $(EIGEN3_INC)
-lib=-L$(IGL)/lib -ligl -liglpng -L$(DEFAULT_PREFIX)/lib $(OPENGL_LIB) $(GLUT_LIB) $(YIMG_LIB) $(LIBPNG_LIB)
+inc=$(LIBIGL_INC) $(YIMG_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB) $(OPENGL_LIB) $(GLUT_LIB) $(YIMG_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 23
examples/rotate-widget/Makefile

@@ -8,29 +8,8 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglmatlab
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 2 - 23
examples/scene-rotation/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,29 +7,9 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include -DIGL_HEADER_ONLY
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglmatlab 
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
 
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC)  $(GLUT_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 2 - 26
examples/shadow-mapping/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,31 +7,8 @@ all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-CARBON_LIB=-framework Carbon
-
-## Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-#GLUT_LIB=$(FREE_GLUT_LIB)
-#GLUT_INC=$(FREE_GLUT_INC)
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 3 - 46
examples/skeleton-builder/Makefile

@@ -1,58 +1,15 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglembree
 
 all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-TETGEN=$(LIBIGL)/external/tetgen
-TETGEN_LIB=-L$(TETGEN) -ltet 
-TETGEN_INC=-I$(TETGEN)
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/include
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
-ifdef IGL_NO_MOSEK
-CFLAGS+=-DIGL_NO_MOSEK
-else
-# Adjust your mosek paths etc. accordingly
-ifndef MOSEKPLATFORM
-  MOSEKPLATFORM=osx64x86
-endif
-ifndef MOSEKVERSION
-  MOSEKVERSION=6
-endif
-IGLMOSEK=
-IGLMOSEK_INC=
-MOSEK=/usr/local/mosek
-MOSEK_INC=
-MOSEK_LIB=
-endif
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC) ${TETGEN_INC} $(MOSEK_INC) $(EMBREE_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB) $(TETGEN_LIB) $(MOSEK_LIB) $(EMBREE_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC) ${TETGEN_INC} $(MOSEK_INC) $(EMBREE_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(TETGEN_LIB) $(MOSEK_LIB) $(EMBREE_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 4 - 31
examples/skeleton-posing/Makefile

@@ -1,39 +1,13 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglbbw -liglcgal
 
 all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglcgal -ligltetgen -liglbbw -liglmosek
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-TETGEN=$(LIBIGL)/external/tetgen
-TETGEN_LIB=-L$(TETGEN) -ltet 
-TETGEN_INC=-I$(TETGEN)
-
-EMBREE=$(LIBIGL)/external/embree
-EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree
-EMBREE_LIB=-L$(EMBREE)/build -lembree -lsys
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
 ifdef IGL_NO_MOSEK
 CFLAGS+=-DIGL_NO_MOSEK
 else
@@ -44,11 +18,10 @@ endif
 ifndef MOSEKVERSION
   MOSEKVERSION=7
 endif
-IGLMOSEK=../mosek/
-IGLMOSEK_INC=-I$(IGLMOSEK)/
 MOSEK=/usr/local/mosek
 MOSEK_INC=-I$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/h
 MOSEK_LIB=-L$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/bin -lmosek64
+LIBIGL_LIB+=-liglmosek 
 endif
 
 CGAL=/opt/local/
@@ -58,8 +31,8 @@ CGAL_INC=-I$(CGAL)/include -I/usr/include/
 CGAL_FLAGS=-frounding-math -fsignaling-nans 
 CFLAGS+=$(CGAL_FLAGS)
 
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC) ${CGAL_INC} ${TETGEN_INC} $(MOSEK_INC) $(EMBREE_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) ${CGAL_LIB} $(CARBON_LIB) $(TETGEN_LIB) $(MOSEK_LIB) $(EMBREE_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC) ${CGAL_INC} ${TETGEN_INC} $(MOSEK_INC) $(EMBREE_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) ${CGAL_LIB} $(TETGEN_LIB) $(MOSEK_LIB) $(EMBREE_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 3 - 25
examples/skeleton/Makefile

@@ -1,35 +1,13 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglbbw -liglmosek
 
 all: obj example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -ligltetgen -liglbbw -liglmosek
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-TETGEN=$(LIBIGL)/external/tetgen
-TETGEN_LIB=-L$(TETGEN) -ltet 
-TETGEN_INC=-I$(TETGEN)
-
-CARBON_LIB=-framework Carbon
-
-# Use free glut for mouse scrolling
-#FREE_GLUT=/opt/local/
-#FREE_GLUT_INC=-I$(FREE_GLUT)/include
-#FREE_GLUT_LIB=-L$(FREE_GLUT)/lib -lglut
-GLUT_LIB=-framework GLUT
-GLUT_INC=
-
 ifdef IGL_NO_MOSEK
 CFLAGS+=-DIGL_NO_MOSEK
 else
@@ -47,8 +25,8 @@ MOSEK_INC=-I$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/h
 MOSEK_LIB=-L$(MOSEK)/$(MOSEKVERSION)/tools/platform/$(MOSEKPLATFORM)/bin -lmosek64
 endif
 
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC) $(GLUT_INC) ${TETGEN_INC} $(MOSEK_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB) $(CARBON_LIB) $(TETGEN_LIB) $(MOSEK_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(GLUT_INC) ${TETGEN_INC} $(MOSEK_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(TETGEN_LIB) $(MOSEK_LIB)
 
 CPP_FILES=$(wildcard ./*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o))) 

+ 2 - 6
examples/slice/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,13 +7,10 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-
 #CFLAGS+=-g
 CFLAGS+=-Os -DNDEBUG
-inc=-I$(igl_lib)/include $(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 5
examples/sort/Makefile

@@ -8,12 +8,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3/
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 6
examples/sortrows/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3/
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 3
examples/stdin_to_temp/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -11,8 +10,8 @@ all: example
 igl_lib=../../
 
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 3
examples/svd/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -11,8 +10,8 @@ all: example
 igl_lib=../../
 
 CFLAGS+=-g
-inc=-I$(igl_lib)/include
-lib=-L$(igl_lib)/lib -ligl -framework Accelerate
+inc=$(LIBIGL_INC) 
+lib=$(LIBIGL_LIB) -framework Accelerate
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 1 - 14
examples/textured-mesh/Makefile

@@ -1,26 +1,13 @@
-
 .PHONY: all
 
 # Shared flags etc.
 include ../../build/Makefile.conf
+LIBIGL_LIB+=-liglpng
 
 all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglpng
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-# YIMAGE Library
-YIMG=$(LIBIGL)/external/yimg/
-YIMG_LIB=-L$(YIMG) -lyimg -lz -L/opt/local/lib -lpng -bind_at_load
-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)
 

+ 2 - 4
examples/trackball/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 all: example
@@ -12,9 +11,8 @@ igl_lib=../../
 
 CFLAGS+=-g -Wall 
 #deps=-MMD -MF depends.txt
-EIGEN3_INC=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
-inc=-I$(igl_lib)/include $(EIGEN3_INC)
-lib=$(OPENGL_LIB) $(GLUT_LIB) -L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB) $(OPENGL_LIB) $(GLUT_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 14
examples/transparency/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,21 +7,10 @@ all: example
 
 .PHONY: example
 
-LIBIGL=../../
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglmatlab
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
 CFLAGS+=-O3 -fopenmp
 
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
-
-MATLAB_INC=-I$(MATLAB)/extern/include/
-MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++
-
-INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(MATLAB_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(MATLAB_LIB)
+INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 example: example.o
 	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) -o example example.o $(LIB)

+ 2 - 6
examples/transpose_blocks/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -8,12 +7,9 @@ all: example
 
 .PHONY: example
 
-igl_lib=../../
-eigen=$(DEFAULT_PREFIX)/include/eigen3
-
 CFLAGS+=-g
-inc=-I$(igl_lib)/include -I$(eigen)
-lib=-L$(igl_lib)/lib -ligl
+inc=$(LIBIGL_INC) $(EIGEN3_INC)
+lib=$(LIBIGL_LIB)
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

+ 2 - 12
examples/upright/Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: all
 
 # Shared flags etc.
@@ -7,19 +6,10 @@ all: upright
 
 .PHONY: upright
 
-LIBIGL=/usr/local/igl/libigl/
-include $(LIBIGL)/build/Makefile.conf
-LIBIGL_INC=-I$(LIBIGL)/include
-LIBIGL_LIB=-L$(LIBIGL)/lib -ligl
-
-EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported
-
-CARBON_LIB=-framework Carbon
+include ../..//build/Makefile.conf
 
-ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
-ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC)
-LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(CARBON_LIB)
+LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB)
 
 CFLAGS+=-g