major reorganization of directory structure

Former-commit-id: f3e9c39a778e6290eba0f68540f9ce9950fa1b3b

Makefile

@@ -5,14 +5,17 @@ all: lib examples
 
 debug: lib
 
-lib: obj libigl.a
+lib: obj lib/libigl.a
 
 examples:
 	make -C examples
 
-CPP_FILES=$(wildcard ./*.cpp)
+CPP_FILES=$(wildcard include/igl/*.cpp)
 OBJ_FILES=$(addprefix obj/,$(notdir $(CPP_FILES:.cpp=.o)))
 
+# include igl headers
+INC+=-Iinclude/
+
 # optimized default settings
 all: LFLAGS +=
 all: CFLAGS += -O3 -DNDEBUG -Wall
@@ -35,14 +38,14 @@ INC+=$(ANTTWEAKBAR_INC)
 obj: 
 	mkdir -p obj
 
-libigl.a: $(OBJ_FILES)
+lib/libigl.a: $(OBJ_FILES)
 	rm -f $@
 	ar cqs $@ $(OBJ_FILES)
 
-obj/%.o: %.cpp %.h
+obj/%.o: include/igl/%.cpp include/igl/%.h
 	g++ $(CFLAGS) -c -o $@ $< $(INC)
 
 clean:
 	rm -f obj/*.o
-	rm -f libigl.a
+	rm -f lib/libigl.a
 	make -C examples clean

examples/Core/Makefile

@@ -5,8 +5,8 @@ igl_lib=../../
 eigen_lib=/opt/local/include/eigen3/
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen_lib)
+lib=-L$(igl_lib)/lib -ligl
 
 matlab_inc=-I$(MATLAB)/extern/include 
 matlab_lib=-L$(MATLAB)/bin/maci64/ -leng -lmx

examples/Core/example1.cpp

@@ -8,11 +8,11 @@
 
 #include <iostream>
 #include <string>
-#include <read.h>
-#include <write.h>
-#include <cotmatrix.h>
-#include <tt.h>
-#include <edgetopology.h>
+#include <igl/read.h>
+#include <igl/write.h>
+#include <igl/cotmatrix.h>
+#include <igl/tt.h>
+#include <igl/edgetopology.h>
 
 using namespace std;
 

examples/Core/example2.cpp

@@ -12,9 +12,9 @@
 
 #include <iostream>
 #include <string>
-#include <read.h>
+#include <igl/read.h>
 
-#include <matlabinterface.h>
+#include <igl/matlabinterface.h>
 
 using namespace std;
 

examples/ReAntTweakBar/Makefile

@@ -7,8 +7,8 @@ all: example
 
 igl_lib=../../
 
-lib=-lAntTweakBar -framework AppKit -L$(igl_lib) -ligl
-inc=-I$(igl_lib)
+lib=-lAntTweakBar -framework AppKit -L$(igl_lib)/lib -ligl
+inc=-I$(igl_lib)/include
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o -framework OpenGL -framework GLUT $(lib)

examples/ReAntTweakBar/example.cpp

@@ -31,7 +31,7 @@
 //  ---------------------------------------------------------------------------
 
 
-#include "ReAntTweakBar.h"
+#include <igl/ReAntTweakBar.h>
 using namespace igl;
 
 #include <stdlib.h>

examples/affine/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/cat/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3/
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/cat/example.cpp

@@ -1,7 +1,7 @@
 // g++ -o main main.cpp -I. -I/usr/local/include/eigen3
 #include <Eigen/Core>
 #include <iostream>
-#include "cat.h"
+#include <igl/cat.h>
 
 using namespace std;
 using namespace igl;

examples/dmat/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/dmat/example.cpp

@@ -1,6 +1,6 @@
 #include <Eigen/Core>
-#include "readDMAT.h"
-#include "writeDMAT.h"
+#include <igl/readDMAT.h>
+#include <igl/writeDMAT.h>
 using namespace igl;
 #include <cstdio>
 

examples/eigen-gotchas/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=-I/usr/local/include/eigen3 -I/usr/local/include/eigen3/unsupported
 
 CFLAGS=-g
-inc=-I$(igl_lib) $(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include $(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/eigen-gotchas/example.cpp

@@ -11,7 +11,7 @@ using namespace Eigen;
 #include <iostream>
 using namespace std;
 
-#include "print_ijv.h"
+#include <igl/print_ijv.h>
 using namespace igl;
 
 // Eigen fails to notice at compile time that the inneriterator used to loop

examples/example_fun/Makefile

@@ -5,9 +5,9 @@ all: example_static example_header_only
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
+inc=-I$(igl_lib)/include
 
-STATIC_LIB=-ligl -L../../
+STATIC_LIB=-ligl -L../../lib
 HEADER_ONLY_DEF=-DIGL_HEADER_ONLY
 
 example_static: example_static.o

examples/example_fun/example.cpp

@@ -1,4 +1,4 @@
-#include "example_fun.h"
+#include <igl/example_fun.h>
 using namespace igl;
 using namespace std;
 

examples/file_contents_as_string/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/file_contents_as_string/example.cpp

@@ -1,4 +1,4 @@
-#include "file_contents_as_string.h"
+#include <igl/file_contents_as_string.h>
 using namespace igl;
 #include <cstdio>
 #include <string>

examples/get_seconds/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g -Wall
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/get_seconds/example.cpp

@@ -1,6 +1,6 @@
 #include <cstdio>
 
-#include "get_seconds.h"
+#include <igl/get_seconds.h>
 using namespace igl;
 #include <cmath>
 using namespace std;

examples/glslversion/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
-lib=-framework OpenGL -framework GLUT -L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-framework OpenGL -framework GLUT -L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/glut_speed_test/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g -Wall 
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o -framework OpenGL -framework GLUT $(lib)

examples/glut_speed_test/example.cpp

@@ -1,4 +1,4 @@
-#include "get_seconds.h"
+#include <igl/get_seconds.h>
 using namespace igl;
 #include <cstdio>
 #include <cmath>

examples/is_dir/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/is_dir/example.cpp

@@ -1,4 +1,4 @@
-#include "is_dir.h"
+#include <igl/is_dir.h>
 using namespace igl;
 #include <cstdio>
 

examples/meshio/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=-I/usr/local/include/eigen3
 
 CFLAGS=-g
-inc=-I$(igl_lib) $(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include $(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/meshio/example.cpp

@@ -1,4 +1,4 @@
-#include "readOBJ.h"
+#include <igl/readOBJ.h>
 
 #include <cstdio>
 #include <vector>

examples/mode/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3/
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/mode/example.cpp

@@ -1,7 +1,7 @@
 // g++ -o main main.cpp -I. -I/usr/local/include/eigen3
 #include <Eigen/Core>
 #include <iostream>
-#include "mode.h"
+#include <igl/mode.h>
 
 using namespace std;
 using namespace igl;

examples/path_tests/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/path_tests/example.cpp

@@ -1,8 +1,8 @@
-#include "file_exists.h"
-#include "is_dir.h"
-#include "is_file.h"
-#include "is_readable.h"
-#include "is_writable.h"
+#include <igl/file_exists.h>
+#include <igl/is_dir.h>
+#include <igl/is_file.h>
+#include <igl/is_readable.h>
+#include <igl/is_writable.h>
 using namespace igl;
 #include <cstdio>
 

examples/pathinfo/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g -Wall 
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib) 

examples/pathinfo/example.cpp

@@ -1,5 +1,5 @@
 #define VERBOSE
-#include "pathinfo.h"
+#include <igl/pathinfo.h>
 using namespace igl;
 #include <string>
 #include <cstdio>

examples/slice/Makefile

@@ -10,8 +10,8 @@ eigen=-I/usr/local/include/eigen3 -I/usr/local/include/eigen3/unsupported
 
 #CFLAGS=-g
 CFLAGS=-Os -DNDEBUG
-inc=-I$(igl_lib) $(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include $(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/slice/example.cpp

@@ -8,9 +8,9 @@ using namespace Eigen;
 #include <iostream>
 using namespace std;
 
-#include "slice.h"
-#include "speye.h"
-#include "print_ijv.h"
+#include <igl/slice.h>
+#include <igl/speye.h>
+#include <igl/print_ijv.h>
 using namespace igl;
 
 int main(int argc, char * argv[])

examples/sort/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3/
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/sort/example.cpp

@@ -2,7 +2,7 @@
 #include <Eigen/Core>
 #include <iostream>
 using namespace std;
-#include "sort.h"
+#include <igl/sort.h>
 using namespace igl;
 
 

examples/stdin_to_temp/Makefile

@@ -8,8 +8,8 @@ all: example
 igl_lib=../../
 
 CFLAGS=-g
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/stdin_to_temp/example.cpp

@@ -13,7 +13,7 @@
  *
  */
 
-#include "stdin_to_temp.h"
+#include <igl/stdin_to_temp.h>
 using namespace igl;
 
 #include <cstdio>

examples/trackball/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 
 CFLAGS=-g -Wall 
 #deps=-MMD -MF depends.txt
-inc=-I$(igl_lib)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o -framework OpenGL -framework GLUT $(lib)

examples/trackball/example.cpp

@@ -7,10 +7,10 @@
 */
 
 // IGL library
-#include "quat_to_mat.h"
-#include "quat_mult.h"
-#include "axis_angle_to_quat.h"
-#include "trackball.h"
+#include <igl/quat_to_mat.h>
+#include <igl/quat_mult.h>
+#include <igl/axis_angle_to_quat.h>
+#include <igl/trackball.h>
 using namespace igl;
 
 #include <stdlib.h>

examples/transpose_blocks/Makefile

@@ -9,8 +9,8 @@ igl_lib=../../
 eigen=/usr/local/include/eigen3
 
 CFLAGS=-g
-inc=-I$(igl_lib) -I$(eigen)
-lib=-L$(igl_lib) -ligl
+inc=-I$(igl_lib)/include -I$(eigen)
+lib=-L$(igl_lib)/lib -ligl
 
 example: example.o
 	g++ $(CFLAGS) -o example example.o $(lib)

examples/transpose_blocks/example.cpp

@@ -1,7 +1,7 @@
 #include <cstdio>
 #include <iostream>
 using namespace std;
-#include "transpose_blocks.h"
+#include <igl/transpose_blocks.h>
 using namespace igl;
 
 int main(int argc,char * argv[])

example_fun.cpp → include/igl/example_fun.cpp

@@ -1,4 +1,4 @@
-#include "example_fun.h"
+#include "igl/example_fun.h"
 #include <iostream>
 
 template <typename Printable>