IGL_HEADER_ONLY --> ~IGL_STATIC_LIBRARY

segovia · Jun 25, 2014 · 00fd1c9 · 00fd1c9
1 parent 5e729fd
commit 00fd1c9
Show file tree

Hide file tree

Showing 500 changed files with 510 additions and 509 deletions.
diff --git a/build/Makefile.conf b/build/Makefile.conf
@@ -10,6 +10,7 @@ GG=g++
 #GG=g++-mp-4.3       15.5s
 #GG=g++-mp-4.7       19.9s
 
+CFLAGS += -DIGL_STATIC_LIBRARY
 CFLAGS += -Wall
 CFLAGS += -std=c++11
 

diff --git a/examples/MatlabWorkspace/example.cpp b/examples/MatlabWorkspace/example.cpp
@@ -3,13 +3,13 @@
 #include <igl/readDMAT.h>
 #include <cstdio>
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 #  define IGL_HEADER_ONLY
 #  define IGL_HEADER_ONLY_WAS_NOT_DEFINED
 #endif
 #include <igl/matlab/MatlabWorkspace.h>
 #include <igl/on_boundary.h>
-#ifdef IGL_HEADER_ONLY_WAS_NOT_DEFINED
+#ifndef IGL_STATIC_LIBRARY_WAS_NOT_DEFINED
 #  undef IGL_HEADER_ONLY
 #endif
 

diff --git a/examples/affine/Makefile b/examples/affine/Makefile
@@ -11,7 +11,7 @@ include ../../build/Makefile.conf
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/basic_topology/Makefile b/examples/basic_topology/Makefile
@@ -7,7 +7,7 @@ include ../../build/Makefile.conf
 igl_lib=../../
 eigen_lib=$(DEFAULT_PREFIX)/include/eigen3/
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen_lib)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/beach-balls/Makefile b/examples/beach-balls/Makefile
@@ -8,7 +8,7 @@ all: obj example
 
 .PHONY: example
 
-CFLAGS=-g -std=c++11
+CFLAGS+=-g -std=c++11
 
 LIBIGL=../../
 LIBIGL_INC=-I$(LIBIGL)/include

diff --git a/examples/cat/Makefile b/examples/cat/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3/
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/dmat/Makefile b/examples/dmat/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/eigen-gotchas/Makefile b/examples/eigen-gotchas/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include $(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/example_fun/Makefile b/examples/example_fun/Makefile
@@ -7,7 +7,7 @@ include ../../build/Makefile.conf
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 
 STATIC_LIB=-ligl -L../../lib

diff --git a/examples/example_fun/example.cpp b/examples/example_fun/example.cpp
@@ -8,7 +8,7 @@ int main(int argc, char * argv[])
   example_fun(d);
   int i = 4;
   example_fun(i);
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
   const char * s = "string";
   example_fun(s);
 #endif

diff --git a/examples/file_contents_as_string/Makefile b/examples/file_contents_as_string/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/get_seconds/Makefile b/examples/get_seconds/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g -Wall
+CFLAGS+=-g -Wall
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/glslversion/Makefile b/examples/glslversion/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 lib=$(OPENGL_LIB) $(GLUT_LIB) -L$(igl_lib)/lib -ligl
 

diff --git a/examples/glut_speed_test/Makefile b/examples/glut_speed_test/Makefile
@@ -10,7 +10,7 @@ include ../../build/Makefile.conf
 
 igl_lib=../../
 
-CFLAGS=-g -Wall 
+CFLAGS+=-g -Wall 
 inc=-I$(igl_lib)/include
 lib=$(OPENGL_LIB) $(GLUT_LIB) -L$(igl_lib)/lib -ligl
 

diff --git a/examples/harwell_boeing/Makefile b/examples/harwell_boeing/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include $(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/is_dir/Makefile b/examples/is_dir/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/marching_cubes/Makefile b/examples/marching_cubes/Makefile
@@ -11,7 +11,7 @@ include ../../build/Makefile.conf
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include $(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/meshio/Makefile b/examples/meshio/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include $(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/mode/Makefile b/examples/mode/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3/
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/patches/Makefile b/examples/patches/Makefile
@@ -8,7 +8,7 @@ all: obj example
 
 .PHONY: example
 
-CFLAGS=-g -std=c++11
+CFLAGS+=-g -std=c++11
 
 LIBIGL=../../
 LIBIGL_INC=-I$(LIBIGL)/include

diff --git a/examples/path_tests/Makefile b/examples/path_tests/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g -Wall
+CFLAGS+=-g -Wall
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/pathinfo/Makefile b/examples/pathinfo/Makefile
@@ -10,7 +10,7 @@ include ../../build/Makefile.conf
 
 igl_lib=../../
 
-CFLAGS=-g -Wall 
+CFLAGS+=-g -Wall 
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/principal_curvature/curvature.cpp b/examples/principal_curvature/curvature.cpp
@@ -1,5 +1,5 @@
 
-#define IGL_HEADER_ONLY
+#undef IGL_STATIC_LIBRARY
 #include <igl/principal_curvature.h>
 #include <igl/read_triangle_mesh.h>
 #include <iostream>

diff --git a/examples/scene-rotation/trackball.h b/examples/scene-rotation/trackball.h
@@ -83,4 +83,4 @@ axis_to_quat(float a[3], float phi, float q[4]);
 void quat_to_axis(float q[4], float axis[3], float &phi);
 void add_quats_no_renorm(float q1[4], float q2[4], float dest[4]);
 void quat_rotate_point(float q[4], const float p1[3], float p2[3]);
-////Olga////
+////Olga////
diff --git a/examples/slice/Makefile b/examples/slice/Makefile
@@ -11,8 +11,8 @@ all: example
 igl_lib=../../
 eigen=-I$(DEFAULT_PREFIX)/include/eigen3 -I$(DEFAULT_PREFIX)/include/eigen3/unsupported
 
-#CFLAGS=-g
-CFLAGS=-Os -DNDEBUG
+#CFLAGS+=-g
+CFLAGS+=-Os -DNDEBUG
 inc=-I$(igl_lib)/include $(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/sort/Makefile b/examples/sort/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3/
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/sortrows/Makefile b/examples/sortrows/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3/
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/stdin_to_temp/Makefile b/examples/stdin_to_temp/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/examples/svd/Makefile b/examples/svd/Makefile
@@ -10,7 +10,7 @@ all: example
 
 igl_lib=../../
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include
 lib=-L$(igl_lib)/lib -ligl -framework Accelerate
 

diff --git a/examples/trackball/Makefile b/examples/trackball/Makefile
@@ -10,7 +10,7 @@ include ../../build/Makefile.conf
 
 igl_lib=../../
 
-CFLAGS=-g -Wall 
+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)

diff --git a/examples/transpose_blocks/Makefile b/examples/transpose_blocks/Makefile
@@ -11,7 +11,7 @@ all: example
 igl_lib=../../
 eigen=$(DEFAULT_PREFIX)/include/eigen3
 
-CFLAGS=-g
+CFLAGS+=-g
 inc=-I$(igl_lib)/include -I$(eigen)
 lib=-L$(igl_lib)/lib -ligl
 

diff --git a/include/igl/EPS.cpp b/include/igl/EPS.cpp
@@ -25,6 +25,6 @@ template <> IGL_INLINE double igl::EPS_SQ()
   return igl::DOUBLE_EPS_SQ;
 }
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 #endif
diff --git a/include/igl/EPS.h b/include/igl/EPS.h
@@ -25,7 +25,7 @@ namespace igl
   template <> IGL_INLINE double EPS_SQ<double>();
 }
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "EPS.cpp"
 #endif
 

diff --git a/include/igl/ReAntTweakBar.h b/include/igl/ReAntTweakBar.h
@@ -275,7 +275,7 @@ namespace igl
 //TW_API int      TW_CALL TwRemoveVar(TwBar *bar, const char *name);
 //TW_API int      TW_CALL TwRemoveAllVars(TwBar *bar);
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "ReAntTweakBar.cpp"
 #endif
 

diff --git a/include/igl/active_set.cpp b/include/igl/active_set.cpp
@@ -347,7 +347,7 @@ IGL_INLINE igl::SolverStatus igl::active_set(
 }
 
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 template igl::SolverStatus igl::active_set<double, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<int, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, double, Eigen::Matrix<double, -1, 1, 0, -1, 1>, double, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1>, Eigen::Matrix<double, -1, 1, 0, -1, 1> >(Eigen::SparseMatrix<double, 0, int> const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, 1, 0, -1, 1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, Eigen::SparseMatrix<double, 0, int> const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, Eigen::SparseMatrix<double, 0, int> const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> > const&, igl::active_set_params const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&);
 #endif
diff --git a/include/igl/active_set.h b/include/igl/active_set.h
@@ -106,7 +106,7 @@ struct igl::active_set_params
     {};
 };
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "active_set.cpp"
 #endif
 

diff --git a/include/igl/add_barycenter.cpp b/include/igl/add_barycenter.cpp
@@ -52,6 +52,6 @@ IGL_INLINE void igl::add_barycenter(
 }
 
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 #endif
diff --git a/include/igl/add_barycenter.h b/include/igl/add_barycenter.h
@@ -31,7 +31,7 @@ namespace igl
 
 }
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "add_barycenter.cpp"
 #endif
 

diff --git a/include/igl/adjacency_list.cpp b/include/igl/adjacency_list.cpp
@@ -158,7 +158,7 @@ IGL_INLINE void igl::adjacency_list(
 
 }
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 // generated by autoexplicit.sh
 template void igl::adjacency_list<Eigen::Matrix<int, -1, -1, 0, -1, -1>, int>(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, std::vector<std::vector<int, std::allocator<int> >, std::allocator<std::vector<int, std::allocator<int> > > >&, bool);

diff --git a/include/igl/adjacency_list.h b/include/igl/adjacency_list.h
@@ -44,7 +44,7 @@ namespace igl
 
 }
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "adjacency_list.cpp"
 #endif
 

diff --git a/include/igl/adjacency_matrix.cpp b/include/igl/adjacency_matrix.cpp
@@ -63,7 +63,7 @@ IGL_INLINE void igl::adjacency_matrix(
   }
 }
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 template void igl::adjacency_matrix<int>(Eigen::Matrix<int, -1, -1, 0, -1, -1> const&, Eigen::SparseMatrix<int, 0, int>&);
 template void igl::adjacency_matrix<double>(Eigen::Matrix<int, -1, -1, 0, -1, -1> const&, Eigen::SparseMatrix<double, 0, int>&);

diff --git a/include/igl/adjacency_matrix.h b/include/igl/adjacency_matrix.h
@@ -44,7 +44,7 @@ namespace igl
     Eigen::SparseMatrix<T>& A);
 }
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "adjacency_matrix.cpp"
 #endif
 

diff --git a/include/igl/all_edges.h b/include/igl/all_edges.h
@@ -27,7 +27,7 @@ namespace igl
     Eigen::MatrixXi & E);
 }
 
-#ifdef IGL_HEADER_ONLY
+#ifndef IGL_STATIC_LIBRARY
 #  include "all_edges.cpp"
 #endif
 

diff --git a/include/igl/all_pairs_distances.cpp b/include/igl/all_pairs_distances.cpp
@@ -32,7 +32,7 @@ IGL_INLINE void igl::all_pairs_distances(
   }
 }
 
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
 // generated by autoexplicit.sh
 template void igl::all_pairs_distances<Eigen::Matrix<double, -1, -1, 0, -1, -1> >(Eigen::Matrix<double, -1, -1, 0, -1, -1> const&, Eigen::Matrix<double, -1, -1, 0, -1, -1> const&, bool, Eigen::Matrix<double, -1, -1, 0, -1, -1>&);
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ struct igl::active_set_params @@
         {};
     };
-    #ifdef IGL_HEADER_ONLY
+    #ifndef IGL_STATIC_LIBRARY
     #  include "active_set.cpp"
     #endif
@@ Expand Down @@