diff --git a/build/Makefile.conf b/build/Makefile.conf index 29e1ab5d9..91e0e79b0 100644 --- 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 index f3b6c7083..f26e55ae8 100644 --- a/examples/MatlabWorkspace/example.cpp +++ b/examples/MatlabWorkspace/example.cpp @@ -3,13 +3,13 @@ #include #include -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY # define IGL_HEADER_ONLY # define IGL_HEADER_ONLY_WAS_NOT_DEFINED #endif #include #include -#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 index ca6c0b64e..f62274fdd 100644 --- 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 index b0322d284..28d97fae6 100644 --- 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 index 015ca88c5..c32f62dbc 100644 --- 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 index 5880a8a06..d6f671fd7 100644 --- 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 index 7759eb827..49de6dbab 100644 --- 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 index cec152903..78cda5e1f 100644 --- 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 index 0bbb08ba3..1a47c48bb 100644 --- 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 index 6f969bc37..ddfbf78e3 100644 --- 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 index 4c7d1d0d4..0888df2c4 100644 --- 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 index 9d5db710e..062652eb2 100644 --- 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 index 9a8ab2e82..905e7dd57 100644 --- 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 index 269619b55..bb6c0fdda 100644 --- 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 index cec152903..78cda5e1f 100644 --- 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 index 4c7d1d0d4..0888df2c4 100644 --- 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 index 492026c74..46e0ef252 100644 --- 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 index 8f1f8e821..a796aff20 100644 --- 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 index 5880a8a06..d6f671fd7 100644 --- 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 index 1fbf2d542..89dbe1d07 100644 --- 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 index 9d5db710e..062652eb2 100644 --- 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 index f91eacc98..eab62cc88 100644 --- 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 index e98c6cb5e..70df79d8a 100644 --- 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 #include #include diff --git a/examples/scene-rotation/trackball.h b/examples/scene-rotation/trackball.h index 59d8ce812..bde2d870a 100644 --- 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//// \ No newline at end of file +////Olga//// diff --git a/examples/slice/Makefile b/examples/slice/Makefile index ddac78ec6..b5522285f 100644 --- 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 index 5880a8a06..d6f671fd7 100644 --- 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 index 5880a8a06..d6f671fd7 100644 --- 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 index 4c7d1d0d4..0888df2c4 100644 --- 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 index 966c49a96..4e902c910 100644 --- 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 index 1a0b5612a..52a342bae 100644 --- 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 index 7759eb827..49de6dbab 100644 --- 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 index 3c1bf7adb..ee7f6eb17 100644 --- 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 index 12d374319..d8cdaad99 100644 --- a/include/igl/EPS.h +++ b/include/igl/EPS.h @@ -25,7 +25,7 @@ namespace igl template <> IGL_INLINE double EPS_SQ(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "EPS.cpp" #endif diff --git a/include/igl/ReAntTweakBar.h b/include/igl/ReAntTweakBar.h index 00e6c3494..e52069a37 100644 --- 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 index 1b6732fe2..2052b6454 100644 --- 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, Eigen::Matrix, Eigen::Matrix, double, Eigen::Matrix, double, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::SparseMatrix const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, igl::active_set_params const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/active_set.h b/include/igl/active_set.h index 26ada0fe4..ee2ff4efe 100644 --- 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 index ef6786829..0a07b72ac 100644 --- 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 index bf8c3eb85..c12ceadac 100644 --- 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 index 0188f78ce..c185eea7f 100644 --- 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, int>(Eigen::PlainObjectBase > const&, std::vector >, std::allocator > > >&, bool); diff --git a/include/igl/adjacency_list.h b/include/igl/adjacency_list.h index bd6a6deae..7438cde42 100644 --- 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 index 56b496ce6..4fbf450c1 100644 --- 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(Eigen::Matrix const&, Eigen::SparseMatrix&); template void igl::adjacency_matrix(Eigen::Matrix const&, Eigen::SparseMatrix&); diff --git a/include/igl/adjacency_matrix.h b/include/igl/adjacency_matrix.h index 23ef9d0a7..40d1c958e 100644 --- a/include/igl/adjacency_matrix.h +++ b/include/igl/adjacency_matrix.h @@ -44,7 +44,7 @@ namespace igl Eigen::SparseMatrix& 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 index 21de9fa8d..6dcc55a8b 100644 --- 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 index 67de970f5..3574396aa 100644 --- 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 const&, Eigen::Matrix const&, bool, Eigen::Matrix&); diff --git a/include/igl/all_pairs_distances.h b/include/igl/all_pairs_distances.h index 5b482224f..9acc1b730 100644 --- a/include/igl/all_pairs_distances.h +++ b/include/igl/all_pairs_distances.h @@ -34,7 +34,7 @@ namespace igl Mat & D); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "all_pairs_distances.cpp" #endif diff --git a/include/igl/angular_distance.h b/include/igl/angular_distance.h index e8cedeb1d..35b100ace 100644 --- a/include/igl/angular_distance.h +++ b/include/igl/angular_distance.h @@ -23,7 +23,7 @@ namespace igl const Eigen::Quaterniond & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "angular_distance.cpp" #endif diff --git a/include/igl/any_of.cpp b/include/igl/any_of.cpp index 737611b1a..8b02635e0 100644 --- a/include/igl/any_of.cpp +++ b/include/igl/any_of.cpp @@ -13,7 +13,7 @@ IGL_INLINE bool igl::any_of(const Mat & S) return std::any_of(S.data(),S.data()+S.size(),[](bool s){return s;}); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::any_of >(Eigen::Matrix const&); #endif diff --git a/include/igl/any_of.h b/include/igl/any_of.h index edf00963e..35da9ae96 100644 --- a/include/igl/any_of.h +++ b/include/igl/any_of.h @@ -18,7 +18,7 @@ namespace igl template IGL_INLINE bool any_of(const Mat & S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "any_of.cpp" #endif #endif diff --git a/include/igl/arap_linear_block.cpp b/include/igl/arap_linear_block.cpp index e10fd4754..70f9bd6e7 100644 --- a/include/igl/arap_linear_block.cpp +++ b/include/igl/arap_linear_block.cpp @@ -251,7 +251,7 @@ IGL_INLINE void igl::arap_linear_block_elements( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template IGL_INLINE void igl::arap_linear_block, Eigen::Matrix, double>(Eigen::Matrix const&, Eigen::Matrix const&, int, igl::ARAPEnergyType, Eigen::SparseMatrix&); #endif diff --git a/include/igl/arap_linear_block.h b/include/igl/arap_linear_block.h index a3efdbd9b..8dfb744f6 100644 --- a/include/igl/arap_linear_block.h +++ b/include/igl/arap_linear_block.h @@ -71,7 +71,7 @@ namespace igl Eigen::SparseMatrix & Kd); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "arap_linear_block.cpp" #endif diff --git a/include/igl/arap_rhs.h b/include/igl/arap_rhs.h index 1b15d4afb..5a1c370c1 100644 --- a/include/igl/arap_rhs.h +++ b/include/igl/arap_rhs.h @@ -36,7 +36,7 @@ namespace igl const igl::ARAPEnergyType energy, Eigen::SparseMatrix& K); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "arap_rhs.cpp" #endif #endif diff --git a/include/igl/areamatrix.cpp b/include/igl/areamatrix.cpp index 17af9e7ba..249858bb7 100644 --- a/include/igl/areamatrix.cpp +++ b/include/igl/areamatrix.cpp @@ -50,7 +50,7 @@ IGL_INLINE void igl::areamatrix( A = (aux + auxT)/2; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::areamatrix, double>(Eigen::PlainObjectBase > const&, Eigen::SparseMatrix&); #endif diff --git a/include/igl/areamatrix.h b/include/igl/areamatrix.h index dc2f23c23..c7e7020d9 100644 --- a/include/igl/areamatrix.h +++ b/include/igl/areamatrix.h @@ -34,7 +34,7 @@ namespace igl Eigen::SparseMatrix& A); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "areamatrix.cpp" #endif diff --git a/include/igl/avg_edge_length.cpp b/include/igl/avg_edge_length.cpp index ae6772223..858ae89d9 100644 --- a/include/igl/avg_edge_length.cpp +++ b/include/igl/avg_edge_length.cpp @@ -29,7 +29,7 @@ IGL_INLINE double igl::avg_edge_length( return avg / (double) count; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template double igl::avg_edge_length, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/avg_edge_length.h b/include/igl/avg_edge_length.h index 2f0aff261..f7f4dffa8 100644 --- a/include/igl/avg_edge_length.h +++ b/include/igl/avg_edge_length.h @@ -34,7 +34,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "avg_edge_length.cpp" #endif diff --git a/include/igl/axis_angle_to_quat.cpp b/include/igl/axis_angle_to_quat.cpp index e4572be61..5bfcef954 100644 --- a/include/igl/axis_angle_to_quat.cpp +++ b/include/igl/axis_angle_to_quat.cpp @@ -33,7 +33,7 @@ IGL_INLINE void igl::axis_angle_to_quat( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::axis_angle_to_quat(double const*, double, double*); diff --git a/include/igl/axis_angle_to_quat.h b/include/igl/axis_angle_to_quat.h index d41e21c1b..6533b1bec 100644 --- a/include/igl/axis_angle_to_quat.h +++ b/include/igl/axis_angle_to_quat.h @@ -26,7 +26,7 @@ namespace igl Q_type *out); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "axis_angle_to_quat.cpp" #endif diff --git a/include/igl/barycenter.cpp b/include/igl/barycenter.cpp index d07d236ec..79738c822 100644 --- a/include/igl/barycenter.cpp +++ b/include/igl/barycenter.cpp @@ -31,7 +31,7 @@ IGL_INLINE void igl::barycenter( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::barycenter, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::barycenter, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/barycenter.h b/include/igl/barycenter.h index 88d07e9d2..1ef908d80 100644 --- a/include/igl/barycenter.h +++ b/include/igl/barycenter.h @@ -32,7 +32,7 @@ namespace igl Eigen::PlainObjectBase & BC); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "barycenter.cpp" #endif diff --git a/include/igl/barycentric2global.cpp b/include/igl/barycentric2global.cpp index 4b6d9d62b..19ebf2e54 100755 --- a/include/igl/barycentric2global.cpp +++ b/include/igl/barycentric2global.cpp @@ -37,4 +37,4 @@ namespace igl } return R; } -} \ No newline at end of file +} diff --git a/include/igl/barycentric2global.h b/include/igl/barycentric2global.h index 364f8d848..06e1ae025 100755 --- a/include/igl/barycentric2global.h +++ b/include/igl/barycentric2global.h @@ -35,7 +35,7 @@ namespace igl const Eigen::Matrix & bc); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "barycentric2global.cpp" #endif diff --git a/include/igl/barycentric_coordinates.cpp b/include/igl/barycentric_coordinates.cpp index f7498f58e..5ca167fb2 100644 --- a/include/igl/barycentric_coordinates.cpp +++ b/include/igl/barycentric_coordinates.cpp @@ -82,6 +82,6 @@ IGL_INLINE void igl::barycentric_coordinates( L.array().colwise() /= dblA.array(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::barycentric_coordinates, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/barycentric_coordinates.h b/include/igl/barycentric_coordinates.h index 926ee8b26..6ca17b358 100644 --- a/include/igl/barycentric_coordinates.h +++ b/include/igl/barycentric_coordinates.h @@ -61,7 +61,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "barycentric_coordinates.cpp" #endif diff --git a/include/igl/basename.h b/include/igl/basename.h index 63abafb2c..3bbaa6a08 100644 --- a/include/igl/basename.h +++ b/include/igl/basename.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE std::string basename(const std::string & path); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "basename.cpp" #endif diff --git a/include/igl/bbw/bbw.cpp b/include/igl/bbw/bbw.cpp index 01a7231ce..5a3ba55f5 100644 --- a/include/igl/bbw/bbw.cpp +++ b/include/igl/bbw/bbw.cpp @@ -209,7 +209,7 @@ IGL_INLINE bool igl::bbw( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::bbw, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, igl::BBWData&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/bbw/bbw.h b/include/igl/bbw/bbw.h index 589331d2f..5eb56e9b6 100644 --- a/include/igl/bbw/bbw.h +++ b/include/igl/bbw/bbw.h @@ -88,7 +88,7 @@ namespace igl Eigen::PlainObjectBase & W); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "bbw.cpp" #endif diff --git a/include/igl/boost/bfs_orient.cpp b/include/igl/boost/bfs_orient.cpp index 383ed48d0..f780764dd 100644 --- a/include/igl/boost/bfs_orient.cpp +++ b/include/igl/boost/bfs_orient.cpp @@ -95,7 +95,7 @@ IGL_INLINE void igl::bfs_orient( // make sure flip is OK if &FF = &F } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::bfs_orient, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/boost/bfs_orient.h b/include/igl/boost/bfs_orient.h index 9cd654bf3..b37f397d8 100644 --- a/include/igl/boost/bfs_orient.h +++ b/include/igl/boost/bfs_orient.h @@ -29,7 +29,7 @@ namespace igl Eigen::PlainObjectBase & FF, Eigen::PlainObjectBase & C); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "bfs_orient.cpp" #endif diff --git a/include/igl/boost/components.cpp b/include/igl/boost/components.cpp index 1563ab286..15d180170 100644 --- a/include/igl/boost/components.cpp +++ b/include/igl/boost/components.cpp @@ -50,7 +50,7 @@ IGL_INLINE void igl::components( return components(A,C); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::components, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/boost/components.h b/include/igl/boost/components.h index 1bae32449..017ecbd79 100644 --- a/include/igl/boost/components.h +++ b/include/igl/boost/components.h @@ -36,7 +36,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "components.cpp" #endif diff --git a/include/igl/boost/manifold_patches.cpp b/include/igl/boost/manifold_patches.cpp index 95716ee31..9673e6ab6 100644 --- a/include/igl/boost/manifold_patches.cpp +++ b/include/igl/boost/manifold_patches.cpp @@ -90,7 +90,7 @@ IGL_INLINE void igl::manifold_patches( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::manifold_patches, Eigen::Matrix, int>(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::SparseMatrix&); #endif diff --git a/include/igl/boost/manifold_patches.h b/include/igl/boost/manifold_patches.h index 16d47df1d..ca18bbd0b 100644 --- a/include/igl/boost/manifold_patches.h +++ b/include/igl/boost/manifold_patches.h @@ -31,7 +31,7 @@ namespace igl Eigen::PlainObjectBase & C, Eigen::SparseMatrix & A); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "manifold_patches.cpp" #endif #endif diff --git a/include/igl/boundary_conditions.h b/include/igl/boundary_conditions.h index 91d6fed9a..d5b549988 100644 --- a/include/igl/boundary_conditions.h +++ b/include/igl/boundary_conditions.h @@ -40,7 +40,7 @@ namespace igl Eigen::MatrixXd & bc); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "boundary_conditions.cpp" #endif diff --git a/include/igl/boundary_faces.cpp b/include/igl/boundary_faces.cpp index 059c9cc9b..ae5e5df86 100644 --- a/include/igl/boundary_faces.cpp +++ b/include/igl/boundary_faces.cpp @@ -131,7 +131,7 @@ Ret igl::boundary_faces( #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::boundary_faces, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::boundary_faces(std::vector >, std::allocator > > > const&, std::vector >, std::allocator > > >&); diff --git a/include/igl/boundary_faces.h b/include/igl/boundary_faces.h index e85e9c1b7..7acb61f08 100644 --- a/include/igl/boundary_faces.h +++ b/include/igl/boundary_faces.h @@ -49,7 +49,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "boundary_faces.cpp" #endif diff --git a/include/igl/boundary_vertices_sorted.h b/include/igl/boundary_vertices_sorted.h index ff9fde922..609682eaf 100755 --- a/include/igl/boundary_vertices_sorted.h +++ b/include/igl/boundary_vertices_sorted.h @@ -29,7 +29,7 @@ namespace igl Eigen::VectorXi& bnd); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "boundary_vertices_sorted.cpp" #endif diff --git a/include/igl/bounding_box_diagonal.cpp b/include/igl/bounding_box_diagonal.cpp index 71d6ae8d3..68368d813 100644 --- a/include/igl/bounding_box_diagonal.cpp +++ b/include/igl/bounding_box_diagonal.cpp @@ -22,6 +22,6 @@ IGL_INLINE double igl::bounding_box_diagonal( return sqrt((maxV-minV).array().square().sum()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation #endif diff --git a/include/igl/bounding_box_diagonal.h b/include/igl/bounding_box_diagonal.h index 2299115f4..d89025bd5 100644 --- a/include/igl/bounding_box_diagonal.h +++ b/include/igl/bounding_box_diagonal.h @@ -21,7 +21,7 @@ namespace igl IGL_INLINE double bounding_box_diagonal( const Eigen::MatrixXd & V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "bounding_box_diagonal.cpp" #endif diff --git a/include/igl/canonical_quaternions.cpp b/include/igl/canonical_quaternions.cpp index e0a9bca4e..00e3435cf 100644 --- a/include/igl/canonical_quaternions.cpp +++ b/include/igl/canonical_quaternions.cpp @@ -16,6 +16,6 @@ template <> IGL_INLINE double igl::CANONICAL_VIEW_QUAT(int i, int j) return (double)igl::CANONICAL_VIEW_QUAT_D[i][j]; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/canonical_quaternions.h b/include/igl/canonical_quaternions.h index d473191e8..86d90112d 100644 --- a/include/igl/canonical_quaternions.h +++ b/include/igl/canonical_quaternions.h @@ -122,7 +122,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "canonical_quaternions.cpp" #endif diff --git a/include/igl/cat.cpp b/include/igl/cat.cpp index ba40e4623..b01cba8a6 100644 --- a/include/igl/cat.cpp +++ b/include/igl/cat.cpp @@ -143,7 +143,7 @@ IGL_INLINE void cat(const std::vector > & A, Mat & C) } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template Eigen::Matrix igl::cat >(int, Eigen::Matrix const&, Eigen::Matrix const&); diff --git a/include/igl/cat.h b/include/igl/cat.h index e27f18150..3cab7c2ad 100644 --- a/include/igl/cat.h +++ b/include/igl/cat.h @@ -64,7 +64,7 @@ namespace igl IGL_INLINE void cat(const std::vector > & A, Mat & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cat.cpp" #endif diff --git a/include/igl/ceil.cpp b/include/igl/ceil.cpp index 9fefb29fe..7b1fc5c5e 100644 --- a/include/igl/ceil.cpp +++ b/include/igl/ceil.cpp @@ -27,7 +27,7 @@ IGL_INLINE void igl::ceil( Y = X.unaryExpr([](const Scalar &x)->Scalar{return std::ceil(x);}).template cast(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::ceil, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/ceil.h b/include/igl/ceil.h index 349e86024..b6acee904 100644 --- a/include/igl/ceil.h +++ b/include/igl/ceil.h @@ -23,7 +23,7 @@ namespace igl Eigen::PlainObjectBase& Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "ceil.cpp" #endif diff --git a/include/igl/cgal/intersect_other.cpp b/include/igl/cgal/intersect_other.cpp index 6ed451b3d..91d0e6581 100644 --- a/include/igl/cgal/intersect_other.cpp +++ b/include/igl/cgal/intersect_other.cpp @@ -129,6 +129,6 @@ IGL_INLINE void igl::intersect_other( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/cgal/intersect_other.h b/include/igl/cgal/intersect_other.h index 1fe056881..55f48ebcf 100644 --- a/include/igl/cgal/intersect_other.h +++ b/include/igl/cgal/intersect_other.h @@ -45,7 +45,7 @@ namespace igl Eigen::MatrixXi & IF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "intersect_other.cpp" #endif diff --git a/include/igl/cgal/mesh_to_cgal_triangle_list.cpp b/include/igl/cgal/mesh_to_cgal_triangle_list.cpp index b746cd554..6aceaa92d 100644 --- a/include/igl/cgal/mesh_to_cgal_triangle_list.cpp +++ b/include/igl/cgal/mesh_to_cgal_triangle_list.cpp @@ -33,7 +33,7 @@ IGL_INLINE void igl::mesh_to_cgal_triangle_list( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::mesh_to_cgal_triangle_list(Eigen::Matrix const&, Eigen::Matrix const&, std::vector, std::allocator > >&); template void igl::mesh_to_cgal_triangle_list(Eigen::Matrix const&, Eigen::Matrix const&, std::vector, std::allocator > >&); diff --git a/include/igl/cgal/mesh_to_cgal_triangle_list.h b/include/igl/cgal/mesh_to_cgal_triangle_list.h index 708d86d60..e49a7f5b8 100644 --- a/include/igl/cgal/mesh_to_cgal_triangle_list.h +++ b/include/igl/cgal/mesh_to_cgal_triangle_list.h @@ -28,7 +28,7 @@ namespace igl const Eigen::MatrixXi & F, std::vector > & T); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mesh_to_cgal_triangle_list.cpp" #endif diff --git a/include/igl/cgal/point_mesh_squared_distance.cpp b/include/igl/cgal/point_mesh_squared_distance.cpp index 232c0213c..6fa9c7c89 100644 --- a/include/igl/cgal/point_mesh_squared_distance.cpp +++ b/include/igl/cgal/point_mesh_squared_distance.cpp @@ -56,7 +56,7 @@ IGL_INLINE void igl::point_mesh_squared_distance( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::point_mesh_squared_distance( const Eigen::MatrixXd & P, const Eigen::MatrixXd & V, const Eigen::MatrixXi & F, Eigen::VectorXd & sqrD, Eigen::VectorXi & I, Eigen::MatrixXd & C); diff --git a/include/igl/cgal/point_mesh_squared_distance.h b/include/igl/cgal/point_mesh_squared_distance.h index d01321e30..964baef84 100644 --- a/include/igl/cgal/point_mesh_squared_distance.h +++ b/include/igl/cgal/point_mesh_squared_distance.h @@ -37,7 +37,7 @@ namespace igl Eigen::VectorXi & I, Eigen::MatrixXd & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "point_mesh_squared_distance.cpp" #endif diff --git a/include/igl/cgal/selfintersect.h b/include/igl/cgal/selfintersect.h index d3f3f9881..9773aea05 100644 --- a/include/igl/cgal/selfintersect.h +++ b/include/igl/cgal/selfintersect.h @@ -64,7 +64,7 @@ namespace igl Eigen::VectorXi & IM); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "selfintersect.cpp" #endif diff --git a/include/igl/cocoa_key_to_anttweakbar_key.h b/include/igl/cocoa_key_to_anttweakbar_key.h index 755f15311..0980edae1 100644 --- a/include/igl/cocoa_key_to_anttweakbar_key.h +++ b/include/igl/cocoa_key_to_anttweakbar_key.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE int cocoa_key_to_anttweakbar_key(int key); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cocoa_key_to_anttweakbar_key.cpp" #endif diff --git a/include/igl/colon.cpp b/include/igl/colon.cpp index fb0b430b9..056112297 100644 --- a/include/igl/colon.cpp +++ b/include/igl/colon.cpp @@ -75,7 +75,7 @@ IGL_INLINE Eigen::Matrix igl::colon( return I; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template Eigen::Matrix igl::colon(int, int); diff --git a/include/igl/colon.h b/include/igl/colon.h index 34601bac2..29c165ba3 100644 --- a/include/igl/colon.h +++ b/include/igl/colon.h @@ -52,7 +52,7 @@ namespace igl const H hi); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "colon.cpp" #endif diff --git a/include/igl/column_to_quats.h b/include/igl/column_to_quats.h index 87a76bd69..5433c38b5 100644 --- a/include/igl/column_to_quats.h +++ b/include/igl/column_to_quats.h @@ -27,7 +27,7 @@ namespace igl Eigen::Quaterniond,Eigen::aligned_allocator > & vQ); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "columns_to_quats.cpp" #endif diff --git a/include/igl/columnize.cpp b/include/igl/columnize.cpp index da7f93dbc..418762363 100644 --- a/include/igl/columnize.cpp +++ b/include/igl/columnize.cpp @@ -54,7 +54,7 @@ IGL_INLINE void igl::columnize( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::columnize, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, int, Eigen::PlainObjectBase >&); template void igl::columnize, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, int, Eigen::PlainObjectBase >&); diff --git a/include/igl/columnize.h b/include/igl/columnize.h index d39a18995..1bb453af1 100644 --- a/include/igl/columnize.h +++ b/include/igl/columnize.h @@ -35,7 +35,7 @@ namespace igl const int dim, Eigen::PlainObjectBase & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "columnize.cpp" #endif #endif diff --git a/include/igl/comb_cross_field.cpp b/include/igl/comb_cross_field.cpp index 51ae61d43..3674b030e 100644 --- a/include/igl/comb_cross_field.cpp +++ b/include/igl/comb_cross_field.cpp @@ -140,6 +140,6 @@ IGL_INLINE void igl::comb_cross_field(const Eigen::PlainObjectBase &V, cmb.comb(PD1out, PD2out); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/comb_cross_field.h b/include/igl/comb_cross_field.h index 3175ff924..fa3b57648 100644 --- a/include/igl/comb_cross_field.h +++ b/include/igl/comb_cross_field.h @@ -34,7 +34,7 @@ namespace igl Eigen::PlainObjectBase &PD1out, Eigen::PlainObjectBase &PD2out); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "comb_cross_field.cpp" #endif diff --git a/include/igl/comb_frame_field.cpp b/include/igl/comb_frame_field.cpp index 311f43f89..912b33da5 100644 --- a/include/igl/comb_frame_field.cpp +++ b/include/igl/comb_frame_field.cpp @@ -69,7 +69,7 @@ IGL_INLINE void igl::comb_frame_field(const Eigen::PlainObjectBase &V, // PD2_combed = BIS2_combed; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/comb_frame_field.h b/include/igl/comb_frame_field.h index 91adfdd1d..6625d47a7 100644 --- a/include/igl/comb_frame_field.h +++ b/include/igl/comb_frame_field.h @@ -40,7 +40,7 @@ namespace igl Eigen::PlainObjectBase &PD1_combed, Eigen::PlainObjectBase &PD2_combed); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "comb_frame_field.cpp" #endif diff --git a/include/igl/comiso/frame_field.h b/include/igl/comiso/frame_field.h index 0da962884..1769aaac0 100644 --- a/include/igl/comiso/frame_field.h +++ b/include/igl/comiso/frame_field.h @@ -42,7 +42,7 @@ IGL_INLINE void frame_field( ); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "frame_field.cpp" #endif diff --git a/include/igl/comiso/miq.cpp b/include/igl/comiso/miq.cpp index 3c51a2642..e6eeee543 100644 --- a/include/igl/comiso/miq.cpp +++ b/include/igl/comiso/miq.cpp @@ -2275,7 +2275,7 @@ IGL_INLINE void igl::miq(const Eigen::PlainObjectBase &V, } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::mixed_integer_quadrangulate, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, double, double, bool, int, int, bool, std::__1::vector >, std::__1::vector >, std::__1::allocator > > >); #endif diff --git a/include/igl/comiso/miq.h b/include/igl/comiso/miq.h index 3e59575fa..d62589170 100644 --- a/include/igl/comiso/miq.h +++ b/include/igl/comiso/miq.h @@ -88,7 +88,7 @@ namespace igl std::vector roundVertices = std::vector(), std::vector > hardFeatures = std::vector >()); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "miq.cpp" #endif diff --git a/include/igl/comiso/nrosy.h b/include/igl/comiso/nrosy.h index bbf231842..01a1639d8 100644 --- a/include/igl/comiso/nrosy.h +++ b/include/igl/comiso/nrosy.h @@ -48,7 +48,7 @@ IGL_INLINE void nrosy( ); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "nrosy.cpp" #endif diff --git a/include/igl/compute_frame_field_bisectors.cpp b/include/igl/compute_frame_field_bisectors.cpp index caa8fd892..fdd00d8ab 100644 --- a/include/igl/compute_frame_field_bisectors.cpp +++ b/include/igl/compute_frame_field_bisectors.cpp @@ -72,6 +72,6 @@ IGL_INLINE void igl::compute_frame_field_bisectors( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/compute_frame_field_bisectors.h b/include/igl/compute_frame_field_bisectors.h index b72d030f5..4c853febf 100644 --- a/include/igl/compute_frame_field_bisectors.h +++ b/include/igl/compute_frame_field_bisectors.h @@ -46,7 +46,7 @@ namespace igl Eigen::PlainObjectBase& BIS2); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "compute_frame_field_bisectors.cpp" #endif diff --git a/include/igl/cotangent.cpp b/include/igl/cotangent.cpp index 931af9916..e4333c7a3 100644 --- a/include/igl/cotangent.cpp +++ b/include/igl/cotangent.cpp @@ -95,7 +95,7 @@ IGL_INLINE void igl::cotangent( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::cotangent, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/cotangent.h b/include/igl/cotangent.h index bbbb34dd9..4738770fd 100644 --- a/include/igl/cotangent.h +++ b/include/igl/cotangent.h @@ -30,7 +30,7 @@ namespace igl Eigen::PlainObjectBase& C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cotangent.cpp" #endif diff --git a/include/igl/cotmatrix.cpp b/include/igl/cotmatrix.cpp index 33275f471..6edec856d 100644 --- a/include/igl/cotmatrix.cpp +++ b/include/igl/cotmatrix.cpp @@ -80,7 +80,7 @@ IGL_INLINE void igl::cotmatrix( L.setFromTriplets(IJV.begin(),IJV.end()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::cotmatrix, Eigen::Matrix, double>(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix&); diff --git a/include/igl/cotmatrix.h b/include/igl/cotmatrix.h index 660821e4a..9cbe72b71 100644 --- a/include/igl/cotmatrix.h +++ b/include/igl/cotmatrix.h @@ -47,7 +47,7 @@ namespace igl Eigen::SparseMatrix& L); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cotmatrix.cpp" #endif diff --git a/include/igl/covariance_scatter_matrix.h b/include/igl/covariance_scatter_matrix.h index 8378196df..e70c77ab1 100644 --- a/include/igl/covariance_scatter_matrix.h +++ b/include/igl/covariance_scatter_matrix.h @@ -32,7 +32,7 @@ namespace igl Eigen::SparseMatrix& CSM); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "covariance_scatter_matrix.cpp" #endif #endif diff --git a/include/igl/create_index_vbo.cpp b/include/igl/create_index_vbo.cpp index 08cbfd194..1b5b53519 100644 --- a/include/igl/create_index_vbo.cpp +++ b/include/igl/create_index_vbo.cpp @@ -43,6 +43,6 @@ IGL_INLINE void igl::create_index_vbo( } #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/create_index_vbo.h b/include/igl/create_index_vbo.h index 262c28c43..a33e2a562 100644 --- a/include/igl/create_index_vbo.h +++ b/include/igl/create_index_vbo.h @@ -30,7 +30,7 @@ namespace igl GLuint & F_vbo_id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "create_index_vbo.cpp" #endif diff --git a/include/igl/create_mesh_vbo.cpp b/include/igl/create_mesh_vbo.cpp index 4551fb728..69c98ebe9 100644 --- a/include/igl/create_mesh_vbo.cpp +++ b/include/igl/create_mesh_vbo.cpp @@ -39,7 +39,7 @@ IGL_INLINE void igl::create_mesh_vbo( create_vector_vbo(N,N_vbo_id); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif #endif diff --git a/include/igl/create_mesh_vbo.h b/include/igl/create_mesh_vbo.h index 6ef39204e..d1d48d26c 100644 --- a/include/igl/create_mesh_vbo.h +++ b/include/igl/create_mesh_vbo.h @@ -55,7 +55,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "create_mesh_vbo.cpp" #endif diff --git a/include/igl/create_shader_program.h b/include/igl/create_shader_program.h index a68d4f384..a1b68668e 100644 --- a/include/igl/create_shader_program.h +++ b/include/igl/create_shader_program.h @@ -40,7 +40,7 @@ namespace igl GLuint & id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "create_shader_program.cpp" #endif diff --git a/include/igl/create_vector_vbo.cpp b/include/igl/create_vector_vbo.cpp index 5e45c54e3..1d8b1dfcb 100644 --- a/include/igl/create_vector_vbo.cpp +++ b/include/igl/create_vector_vbo.cpp @@ -48,7 +48,7 @@ IGL_INLINE void igl::create_vector_vbo( glBindBuffer(GL_ARRAY_BUFFER, 0); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::create_vector_vbo(Eigen::Matrix const&, unsigned int&); diff --git a/include/igl/create_vector_vbo.h b/include/igl/create_vector_vbo.h index 2ec0d6a63..3e6342282 100644 --- a/include/igl/create_vector_vbo.h +++ b/include/igl/create_vector_vbo.h @@ -33,7 +33,7 @@ namespace igl GLuint & V_vbo_id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "create_vector_vbo.cpp" #endif diff --git a/include/igl/cross.cpp b/include/igl/cross.cpp index ec78d36de..04ee5340b 100644 --- a/include/igl/cross.cpp +++ b/include/igl/cross.cpp @@ -39,7 +39,7 @@ IGL_INLINE void igl::cross( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::cross, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::cross, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/cross.h b/include/igl/cross.h index 00e251472..cfbe563ed 100644 --- a/include/igl/cross.h +++ b/include/igl/cross.h @@ -35,7 +35,7 @@ namespace igl Eigen::PlainObjectBase & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cross.cpp" #endif diff --git a/include/igl/cross_field_missmatch.cpp b/include/igl/cross_field_missmatch.cpp index dea95d4a0..a01e909d9 100644 --- a/include/igl/cross_field_missmatch.cpp +++ b/include/igl/cross_field_missmatch.cpp @@ -160,6 +160,6 @@ IGL_INLINE void igl::cross_field_missmatch(const Eigen::PlainObjectBase &missmatch); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "cross_field_missmatch.cpp" #endif diff --git a/include/igl/cumsum.cpp b/include/igl/cumsum.cpp index 82bf5755e..73a1f28d0 100644 --- a/include/igl/cumsum.cpp +++ b/include/igl/cumsum.cpp @@ -57,7 +57,7 @@ IGL_INLINE void igl::cumsum( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::cumsum, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); template void igl::cumsum, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); diff --git a/include/igl/cumsum.h b/include/igl/cumsum.h index 0cd1f7c5f..260fbee18 100644 --- a/include/igl/cumsum.h +++ b/include/igl/cumsum.h @@ -35,7 +35,7 @@ namespace igl // Eigen::PlainObjectBase & Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "cumsum.cpp" #endif diff --git a/include/igl/cut_mesh_from_singularities.cpp b/include/igl/cut_mesh_from_singularities.cpp index 113213c6f..12423e035 100644 --- a/include/igl/cut_mesh_from_singularities.cpp +++ b/include/igl/cut_mesh_from_singularities.cpp @@ -183,6 +183,6 @@ IGL_INLINE void igl::cut_mesh_from_singularities(const Eigen::PlainObjectBase &singularity_index, Eigen::PlainObjectBase &seams); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "cut_mesh_from_singularities.cpp" #endif diff --git a/include/igl/dated_copy.h b/include/igl/dated_copy.h index 5e16492c7..fdbba77a2 100644 --- a/include/igl/dated_copy.h +++ b/include/igl/dated_copy.h @@ -24,7 +24,7 @@ namespace igl // Wrapper using directory of source file IGL_INLINE bool dated_copy(const std::string & src_path); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dated_copy.cpp" #endif #endif diff --git a/include/igl/destroy_shader_program.h b/include/igl/destroy_shader_program.h index b9d4f1f6e..f14f0e569 100644 --- a/include/igl/destroy_shader_program.h +++ b/include/igl/destroy_shader_program.h @@ -27,7 +27,7 @@ namespace igl IGL_INLINE bool destroy_shader_program(const GLuint id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "destroy_shader_program.cpp" #endif diff --git a/include/igl/diag.cpp b/include/igl/diag.cpp index 7f628bab5..5f002bb80 100644 --- a/include/igl/diag.cpp +++ b/include/igl/diag.cpp @@ -100,7 +100,7 @@ IGL_INLINE void igl::diag( X = Eigen::SparseMatrix(dyn_X); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::diag >(Eigen::SparseMatrix const&, Eigen::MatrixBase >&); template void igl::diag(Eigen::SparseMatrix const&, Eigen::SparseVector&); diff --git a/include/igl/diag.h b/include/igl/diag.h index 73bcb28f5..8001f01b6 100644 --- a/include/igl/diag.h +++ b/include/igl/diag.h @@ -55,7 +55,7 @@ namespace igl Eigen::SparseMatrix& X); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "diag.cpp" #endif diff --git a/include/igl/dihedral_angles.cpp b/include/igl/dihedral_angles.cpp index 7643b5555..c34694cde 100644 --- a/include/igl/dihedral_angles.cpp +++ b/include/igl/dihedral_angles.cpp @@ -88,7 +88,7 @@ IGL_INLINE void igl::dihedral_angles_intrinsic( cos_theta.resize(m,6); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::dihedral_angles_intrinsic, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/dihedral_angles.h b/include/igl/dihedral_angles.h index 318cf95a4..92ac0f862 100644 --- a/include/igl/dihedral_angles.h +++ b/include/igl/dihedral_angles.h @@ -47,7 +47,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dihedral_angles.cpp" #endif diff --git a/include/igl/dirname.h b/include/igl/dirname.h index 2a25609c7..aa7cd74ae 100644 --- a/include/igl/dirname.h +++ b/include/igl/dirname.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE std::string dirname(const std::string & path); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dirname.cpp" #endif diff --git a/include/igl/dot.h b/include/igl/dot.h index b536e0067..9494eac7b 100644 --- a/include/igl/dot.h +++ b/include/igl/dot.h @@ -20,7 +20,7 @@ namespace igl const double *b); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dot.cpp" #endif diff --git a/include/igl/dot_row.cpp b/include/igl/dot_row.cpp index 7ab991287..885f4e34f 100644 --- a/include/igl/dot_row.cpp +++ b/include/igl/dot_row.cpp @@ -19,7 +19,7 @@ IGL_INLINE Eigen::PlainObjectBase igl::dot_row( return (A.array() * B.array()).rowwise().sum(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh #endif diff --git a/include/igl/dot_row.h b/include/igl/dot_row.h index 098f0f7d7..2c64e1bf9 100644 --- a/include/igl/dot_row.h +++ b/include/igl/dot_row.h @@ -29,7 +29,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dot_row.cpp" #endif diff --git a/include/igl/doublearea.cpp b/include/igl/doublearea.cpp index a98fc631f..71d632561 100644 --- a/include/igl/doublearea.cpp +++ b/include/igl/doublearea.cpp @@ -133,7 +133,7 @@ IGL_INLINE void igl::doublearea( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::doublearea, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/doublearea.h b/include/igl/doublearea.h index 2b5b62223..8313afee2 100644 --- a/include/igl/doublearea.h +++ b/include/igl/doublearea.h @@ -72,7 +72,7 @@ namespace igl Eigen::PlainObjectBase & dblA); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "doublearea.cpp" #endif diff --git a/include/igl/dqs.cpp b/include/igl/dqs.cpp index a08f53d3b..862132aa8 100644 --- a/include/igl/dqs.cpp +++ b/include/igl/dqs.cpp @@ -69,7 +69,7 @@ IGL_INLINE void igl::dqs( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::dqs, Eigen::Matrix, Eigen::Quaternion, Eigen::aligned_allocator >, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, std::vector, Eigen::aligned_allocator > > const&, std::vector, std::allocator > > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/dqs.h b/include/igl/dqs.h index bcfb9744c..9b53ae1c7 100644 --- a/include/igl/dqs.h +++ b/include/igl/dqs.h @@ -36,7 +36,7 @@ namespace igl Eigen::PlainObjectBase & U); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "dqs.cpp" #endif #endif diff --git a/include/igl/draw_beach_ball.h b/include/igl/draw_beach_ball.h index 19bd0b138..7e7966c2f 100644 --- a/include/igl/draw_beach_ball.h +++ b/include/igl/draw_beach_ball.h @@ -18,7 +18,7 @@ namespace igl IGL_INLINE void draw_beach_ball(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_beach_ball.cpp" #endif diff --git a/include/igl/draw_floor.h b/include/igl/draw_floor.h index 17f12d729..cf9020e7b 100644 --- a/include/igl/draw_floor.h +++ b/include/igl/draw_floor.h @@ -51,7 +51,7 @@ namespace igl // Wrapper with default colors IGL_INLINE void draw_floor_outline(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_floor.cpp" #endif #endif diff --git a/include/igl/draw_mesh.h b/include/igl/draw_mesh.h index 542ef4c70..a829da1f5 100644 --- a/include/igl/draw_mesh.h +++ b/include/igl/draw_mesh.h @@ -113,7 +113,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_mesh.cpp" #endif diff --git a/include/igl/draw_point.cpp b/include/igl/draw_point.cpp index bc142731f..1986b6a97 100644 --- a/include/igl/draw_point.cpp +++ b/include/igl/draw_point.cpp @@ -90,7 +90,7 @@ IGL_INLINE void igl::draw_point( return draw_point(P(0),P(1),P(2),requested_r,selected); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::draw_point >(Eigen::PlainObjectBase > const&, double, bool); #endif diff --git a/include/igl/draw_point.h b/include/igl/draw_point.h index 518a1d260..947c8376d 100644 --- a/include/igl/draw_point.h +++ b/include/igl/draw_point.h @@ -37,7 +37,7 @@ namespace igl const bool selected = false); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_point.cpp" #endif diff --git a/include/igl/draw_rectangular_marquee.h b/include/igl/draw_rectangular_marquee.h index 51a7f18b4..2dd8b2ef6 100644 --- a/include/igl/draw_rectangular_marquee.h +++ b/include/igl/draw_rectangular_marquee.h @@ -25,7 +25,7 @@ namespace igl const int to_y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_rectangular_marquee.cpp" #endif diff --git a/include/igl/draw_skeleton_3d.cpp b/include/igl/draw_skeleton_3d.cpp index ee09e41df..53a495391 100644 --- a/include/igl/draw_skeleton_3d.cpp +++ b/include/igl/draw_skeleton_3d.cpp @@ -153,7 +153,7 @@ IGL_INLINE void igl::draw_skeleton_3d( return draw_skeleton_3d(C,BE,Eigen::MatrixXd(),MAYA_SEA_GREEN); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::draw_skeleton_3d, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); template void igl::draw_skeleton_3d, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/draw_skeleton_3d.h b/include/igl/draw_skeleton_3d.h index 9b92579ff..6018f7876 100644 --- a/include/igl/draw_skeleton_3d.h +++ b/include/igl/draw_skeleton_3d.h @@ -41,7 +41,7 @@ namespace igl const Eigen::PlainObjectBase & C, const Eigen::PlainObjectBase & BE); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_skeleton_3d.h" #endif #endif diff --git a/include/igl/draw_skeleton_vector_graphics.cpp b/include/igl/draw_skeleton_vector_graphics.cpp index d55b077fb..a2d923d34 100644 --- a/include/igl/draw_skeleton_vector_graphics.cpp +++ b/include/igl/draw_skeleton_vector_graphics.cpp @@ -116,7 +116,7 @@ IGL_INLINE void igl::draw_skeleton_vector_graphics( draw_skeleton_vector_graphics(CT,BET,point_color,line_color); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::draw_skeleton_vector_graphics, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); #endif diff --git a/include/igl/draw_skeleton_vector_graphics.h b/include/igl/draw_skeleton_vector_graphics.h index 432c451d2..818766d92 100644 --- a/include/igl/draw_skeleton_vector_graphics.h +++ b/include/igl/draw_skeleton_vector_graphics.h @@ -43,7 +43,7 @@ namespace igl const Eigen::PlainObjectBase & BE, const Eigen::PlainObjectBase & T); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "draw_skeleton_vector_graphics.h" #endif #endif diff --git a/include/igl/edge_lengths.cpp b/include/igl/edge_lengths.cpp index a35037ba5..9423135b8 100644 --- a/include/igl/edge_lengths.cpp +++ b/include/igl/edge_lengths.cpp @@ -54,7 +54,7 @@ IGL_INLINE void igl::edge_lengths( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::edge_lengths, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/edge_lengths.h b/include/igl/edge_lengths.h index a13e79f2c..30a40ce38 100644 --- a/include/igl/edge_lengths.h +++ b/include/igl/edge_lengths.h @@ -38,7 +38,7 @@ namespace igl Eigen::PlainObjectBase& L); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "edge_lengths.cpp" #endif diff --git a/include/igl/edges.h b/include/igl/edges.h index aed11214e..2e7832bc8 100644 --- a/include/igl/edges.h +++ b/include/igl/edges.h @@ -27,7 +27,7 @@ namespace igl IGL_INLINE void edges( const Eigen::MatrixXi& F, Eigen::MatrixXi& E); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "edges.cpp" #endif diff --git a/include/igl/edgetopology.cpp b/include/igl/edgetopology.cpp index 6fe6e3300..efe33fdd2 100644 --- a/include/igl/edgetopology.cpp +++ b/include/igl/edgetopology.cpp @@ -97,6 +97,6 @@ IGL_INLINE void igl::edgetopology( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/edgetopology.h b/include/igl/edgetopology.h index 6193bb69e..b54dcec36 100644 --- a/include/igl/edgetopology.h +++ b/include/igl/edgetopology.h @@ -29,7 +29,7 @@ namespace igl Eigen::MatrixXi& EF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "edgetopology.cpp" #endif diff --git a/include/igl/embree/ambient_occlusion.cpp b/include/igl/embree/ambient_occlusion.cpp index e5e5d9dfd..5919db1fe 100644 --- a/include/igl/embree/ambient_occlusion.cpp +++ b/include/igl/embree/ambient_occlusion.cpp @@ -76,7 +76,7 @@ IGL_INLINE void igl::ambient_occlusion( ambient_occlusion(ei,P,N,num_samples,S); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); diff --git a/include/igl/embree/ambient_occlusion.h b/include/igl/embree/ambient_occlusion.h index 088f1aa45..f8d35db52 100644 --- a/include/igl/embree/ambient_occlusion.h +++ b/include/igl/embree/ambient_occlusion.h @@ -49,7 +49,7 @@ namespace igl const int num_samples, Eigen::PlainObjectBase & S); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "ambient_occlusion.cpp" #endif diff --git a/include/igl/embree/bone_visible.cpp b/include/igl/embree/bone_visible.cpp index 980608eee..33e328afe 100644 --- a/include/igl/embree/bone_visible.cpp +++ b/include/igl/embree/bone_visible.cpp @@ -123,7 +123,7 @@ IGL_INLINE void igl::bone_visible( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::bone_visible, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::bone_visible, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/embree/bone_visible.h b/include/igl/embree/bone_visible.h index 54f13f03f..cea882dec 100644 --- a/include/igl/embree/bone_visible.h +++ b/include/igl/embree/bone_visible.h @@ -44,7 +44,7 @@ namespace igl const Eigen::PlainObjectBase & d, Eigen::PlainObjectBase & flag); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "bone_visible.cpp" #endif #endif diff --git a/include/igl/embree/project_mesh.h b/include/igl/embree/project_mesh.h index b257daded..677f3f25c 100644 --- a/include/igl/embree/project_mesh.h +++ b/include/igl/embree/project_mesh.h @@ -68,7 +68,7 @@ namespace igl ); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "project_mesh.cpp" #endif diff --git a/include/igl/embree/reorient_facets_raycast.cpp b/include/igl/embree/reorient_facets_raycast.cpp index 9138ab18c..b68c7c5bb 100644 --- a/include/igl/embree/reorient_facets_raycast.cpp +++ b/include/igl/embree/reorient_facets_raycast.cpp @@ -251,7 +251,7 @@ IGL_INLINE void igl::reorient_facets_raycast( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::reorient_facets_raycast, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/embree/reorient_facets_raycast.h b/include/igl/embree/reorient_facets_raycast.h index c8da955c3..4cb362b10 100644 --- a/include/igl/embree/reorient_facets_raycast.h +++ b/include/igl/embree/reorient_facets_raycast.h @@ -62,7 +62,7 @@ namespace igl Eigen::PlainObjectBase & I); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "reorient_facets_raycast.cpp" #endif diff --git a/include/igl/embree/unproject_in_mesh.cpp b/include/igl/embree/unproject_in_mesh.cpp index 931fbeda7..762bd79b5 100644 --- a/include/igl/embree/unproject_in_mesh.cpp +++ b/include/igl/embree/unproject_in_mesh.cpp @@ -65,7 +65,7 @@ IGL_INLINE int igl::unproject_in_mesh( return hits.size(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template int igl::unproject_in_mesh >(int, int, igl::EmbreeIntersector const&, Eigen::PlainObjectBase >&, std::vector >&); template int igl::unproject_in_mesh >(int, int, igl::EmbreeIntersector const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/embree/unproject_in_mesh.h b/include/igl/embree/unproject_in_mesh.h index 91e60e971..8bc751470 100644 --- a/include/igl/embree/unproject_in_mesh.h +++ b/include/igl/embree/unproject_in_mesh.h @@ -45,7 +45,7 @@ namespace igl Eigen::PlainObjectBase & obj, std::vector & hits); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "unproject_in_mesh.cpp" #endif #endif diff --git a/include/igl/example_fun.cpp b/include/igl/example_fun.cpp index 78dac4c1c..2b766e25e 100644 --- a/include/igl/example_fun.cpp +++ b/include/igl/example_fun.cpp @@ -16,7 +16,7 @@ IGL_INLINE bool igl::example_fun(const Printable & input) return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::example_fun(const double& input); template bool igl::example_fun(const int& input); diff --git a/include/igl/example_fun.h b/include/igl/example_fun.h index 2258997df..16c9ec645 100644 --- a/include/igl/example_fun.h +++ b/include/igl/example_fun.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE bool example_fun(const Printable & input); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "example_fun.cpp" #endif diff --git a/include/igl/exterior_edges.h b/include/igl/exterior_edges.h index e9f485117..9a1f8135e 100644 --- a/include/igl/exterior_edges.h +++ b/include/igl/exterior_edges.h @@ -19,7 +19,7 @@ namespace igl // Inline version Eigen::MatrixXi exterior_edges( const Eigen::MatrixXi & F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "exterior_edges.h" #endif diff --git a/include/igl/face_areas.cpp b/include/igl/face_areas.cpp index 77722e760..ae6b632cd 100644 --- a/include/igl/face_areas.cpp +++ b/include/igl/face_areas.cpp @@ -48,7 +48,7 @@ IGL_INLINE void igl::face_areas( A.col(2) = 0.5*A2; A.col(3) = 0.5*A3; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::face_areas, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/face_areas.h b/include/igl/face_areas.h index 654a1a814..6d867afe9 100644 --- a/include/igl/face_areas.h +++ b/include/igl/face_areas.h @@ -37,7 +37,7 @@ namespace igl Eigen::PlainObjectBase& A); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "face_areas.cpp" #endif diff --git a/include/igl/face_occurences.cpp b/include/igl/face_occurences.cpp index 0be186bdc..cf80af92d 100644 --- a/include/igl/face_occurences.cpp +++ b/include/igl/face_occurences.cpp @@ -50,7 +50,7 @@ IGL_INLINE void igl::face_occurences( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::face_occurences(std::vector >, std::allocator > > > const&, std::vector >&); #endif diff --git a/include/igl/face_occurences.h b/include/igl/face_occurences.h index d3d031db9..c495847c7 100644 --- a/include/igl/face_occurences.h +++ b/include/igl/face_occurences.h @@ -25,7 +25,7 @@ namespace igl std::vector & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "face_occurences.cpp" #endif diff --git a/include/igl/faces_first.cpp b/include/igl/faces_first.cpp index c2077f42b..884aba420 100644 --- a/include/igl/faces_first.cpp +++ b/include/igl/faces_first.cpp @@ -97,7 +97,7 @@ IGL_INLINE void igl::faces_first( F = RF; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::faces_first, Eigen::Matrix, Eigen::Matrix >(Eigen::Matrix&, Eigen::Matrix&, Eigen::Matrix&); #endif diff --git a/include/igl/faces_first.h b/include/igl/faces_first.h index c287b1e12..92d1d5565 100644 --- a/include/igl/faces_first.h +++ b/include/igl/faces_first.h @@ -53,7 +53,7 @@ namespace igl VecI & IM); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "faces_first.cpp" #endif diff --git a/include/igl/file_contents_as_string.h b/include/igl/file_contents_as_string.h index 5c62f0d57..bceb098cf 100644 --- a/include/igl/file_contents_as_string.h +++ b/include/igl/file_contents_as_string.h @@ -23,7 +23,7 @@ namespace igl std::string & content); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "file_contents_as_string.cpp" #endif diff --git a/include/igl/file_dialog_open.h b/include/igl/file_dialog_open.h index cae52952f..1b17ea4c6 100644 --- a/include/igl/file_dialog_open.h +++ b/include/igl/file_dialog_open.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE std::string file_dialog_open(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "file_dialog_open.cpp" #endif diff --git a/include/igl/file_dialog_save.h b/include/igl/file_dialog_save.h index b8eaec1bf..f04075758 100644 --- a/include/igl/file_dialog_save.h +++ b/include/igl/file_dialog_save.h @@ -23,7 +23,7 @@ namespace igl IGL_INLINE std::string file_dialog_save(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "file_dialog_save.cpp" #endif diff --git a/include/igl/file_exists.h b/include/igl/file_exists.h index 381fb0bda..fe982aac4 100644 --- a/include/igl/file_exists.h +++ b/include/igl/file_exists.h @@ -19,7 +19,7 @@ namespace igl IGL_INLINE bool file_exists(const char * filename); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "file_exists.cpp" #endif diff --git a/include/igl/find.cpp b/include/igl/find.cpp index 14c394c49..af055d978 100644 --- a/include/igl/find.cpp +++ b/include/igl/find.cpp @@ -60,7 +60,7 @@ IGL_INLINE void igl::find( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::find, Eigen::Matrix, Eigen::Matrix >(Eigen::SparseMatrix const&, Eigen::MatrixBase >&, Eigen::MatrixBase >&, Eigen::MatrixBase >&); diff --git a/include/igl/find.h b/include/igl/find.h index bf9ca8820..deb32a7b7 100644 --- a/include/igl/find.h +++ b/include/igl/find.h @@ -54,7 +54,7 @@ namespace igl Eigen::Matrix & V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "find.cpp" #endif diff --git a/include/igl/find_cross_field_singularities.cpp b/include/igl/find_cross_field_singularities.cpp index bb254b8c6..39b7446fb 100644 --- a/include/igl/find_cross_field_singularities.cpp +++ b/include/igl/find_cross_field_singularities.cpp @@ -73,6 +73,6 @@ IGL_INLINE void igl::find_cross_field_singularities(const Eigen::PlainObjectBase igl::find_cross_field_singularities(V, F, Handle_MMatch, isSingularity, singularityIndex); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/find_cross_field_singularities.h b/include/igl/find_cross_field_singularities.h index 3d86d7106..737efa77c 100644 --- a/include/igl/find_cross_field_singularities.h +++ b/include/igl/find_cross_field_singularities.h @@ -49,7 +49,7 @@ namespace igl Eigen::PlainObjectBase &isSingularity, Eigen::PlainObjectBase &singularityIndex); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "find_cross_field_singularities.cpp" #endif diff --git a/include/igl/fit_plane.cpp b/include/igl/fit_plane.cpp index 0dba5b31c..83f11738f 100644 --- a/include/igl/fit_plane.cpp +++ b/include/igl/fit_plane.cpp @@ -49,7 +49,7 @@ IGL_INLINE void igl::fit_plane( N = es.eigenvectors().col(0); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY #endif diff --git a/include/igl/fit_plane.h b/include/igl/fit_plane.h index b89669c1c..f69ce811b 100644 --- a/include/igl/fit_plane.h +++ b/include/igl/fit_plane.h @@ -28,7 +28,7 @@ namespace igl Eigen::RowVector3d & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "fit_plane.cpp" #endif diff --git a/include/igl/floor.cpp b/include/igl/floor.cpp index 37abe6922..0da1e4d34 100644 --- a/include/igl/floor.cpp +++ b/include/igl/floor.cpp @@ -28,7 +28,7 @@ IGL_INLINE void igl::floor( Y = X.unaryExpr([](const Scalar &x)->Scalar{return std::floor(x);}).template cast(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::floor, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::floor, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/floor.h b/include/igl/floor.h index 7f0b8013c..a84d52068 100644 --- a/include/igl/floor.h +++ b/include/igl/floor.h @@ -23,7 +23,7 @@ namespace igl Eigen::PlainObjectBase& Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "floor.cpp" #endif diff --git a/include/igl/forward_kinematics.cpp b/include/igl/forward_kinematics.cpp index 671535bde..93070508f 100644 --- a/include/igl/forward_kinematics.cpp +++ b/include/igl/forward_kinematics.cpp @@ -54,6 +54,6 @@ IGL_INLINE void igl::forward_kinematics( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation #endif diff --git a/include/igl/forward_kinematics.h b/include/igl/forward_kinematics.h index cbb5a2d73..b19be5167 100644 --- a/include/igl/forward_kinematics.h +++ b/include/igl/forward_kinematics.h @@ -37,7 +37,7 @@ namespace igl std::vector & vT); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "forward_kinematics.cpp" #endif #endif diff --git a/include/igl/frame_field_deformer.cpp b/include/igl/frame_field_deformer.cpp index 294c7ac0c..889c0f549 100644 --- a/include/igl/frame_field_deformer.cpp +++ b/include/igl/frame_field_deformer.cpp @@ -406,6 +406,6 @@ IGL_INLINE void igl::frame_field_deformer( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/frame_field_deformer.h b/include/igl/frame_field_deformer.h index 2a73ffccb..6479a1efd 100644 --- a/include/igl/frame_field_deformer.h +++ b/include/igl/frame_field_deformer.h @@ -42,7 +42,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "frame_field_deformer.cpp" #endif diff --git a/include/igl/frame_to_cross_field.cpp b/include/igl/frame_to_cross_field.cpp index 17ca8c4a5..6bf3b6aa6 100644 --- a/include/igl/frame_to_cross_field.cpp +++ b/include/igl/frame_to_cross_field.cpp @@ -53,6 +53,6 @@ IGL_INLINE void igl::frame_to_cross_field( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/frame_to_cross_field.h b/include/igl/frame_to_cross_field.h index 591e7d5ac..f9bdd3d5f 100644 --- a/include/igl/frame_to_cross_field.h +++ b/include/igl/frame_to_cross_field.h @@ -32,7 +32,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "frame_to_cross_field.cpp" #endif diff --git a/include/igl/full.cpp b/include/igl/full.cpp index 2b7becd69..67388fbee 100644 --- a/include/igl/full.cpp +++ b/include/igl/full.cpp @@ -35,7 +35,7 @@ IGL_INLINE void igl::full( B = A; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::full, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/full.h b/include/igl/full.h index e5cdd9210..9b1238ceb 100644 --- a/include/igl/full.h +++ b/include/igl/full.h @@ -34,7 +34,7 @@ namespace igl Eigen::PlainObjectBase& B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "full.cpp" #endif diff --git a/include/igl/gaussian_curvature.cpp b/include/igl/gaussian_curvature.cpp index 25c5cee45..60d2e466d 100644 --- a/include/igl/gaussian_curvature.cpp +++ b/include/igl/gaussian_curvature.cpp @@ -49,7 +49,7 @@ IGL_INLINE void igl::gaussian_curvature( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::gaussian_curvature, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/gaussian_curvature.h b/include/igl/gaussian_curvature.h index 93cb051cd..ae7d2043b 100644 --- a/include/igl/gaussian_curvature.h +++ b/include/igl/gaussian_curvature.h @@ -24,7 +24,7 @@ namespace igl Eigen::PlainObjectBase & K); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "gaussian_curvature.cpp" #endif diff --git a/include/igl/get_seconds.h b/include/igl/get_seconds.h index 852a756f3..08daee1c3 100644 --- a/include/igl/get_seconds.h +++ b/include/igl/get_seconds.h @@ -16,7 +16,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "get_seconds.cpp" #endif diff --git a/include/igl/get_seconds_hires.h b/include/igl/get_seconds_hires.h index ef08771c9..abe8956b5 100644 --- a/include/igl/get_seconds_hires.h +++ b/include/igl/get_seconds_hires.h @@ -15,7 +15,7 @@ namespace igl IGL_INLINE double get_seconds_hires(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "get_seconds_hires.cpp" #endif diff --git a/include/igl/gl_type_size.h b/include/igl/gl_type_size.h index 8d0d6ade7..e8f9d274b 100644 --- a/include/igl/gl_type_size.h +++ b/include/igl/gl_type_size.h @@ -21,7 +21,7 @@ namespace igl IGL_INLINE int gl_type_size(const GLenum type); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "gl_type_size.cpp" #endif diff --git a/include/igl/gradMat.cpp b/include/igl/gradMat.cpp index e2e205a78..59453992c 100644 --- a/include/igl/gradMat.cpp +++ b/include/igl/gradMat.cpp @@ -101,7 +101,7 @@ IGL_INLINE void igl::gradMat(const Eigen::Matrix(Eigen::Matrix const&, Eigen::Matrix const&,Eigen::SparseMatrix&); #endif diff --git a/include/igl/gradMat.h b/include/igl/gradMat.h index 6c989e33f..cca64afd1 100644 --- a/include/igl/gradMat.h +++ b/include/igl/gradMat.h @@ -38,7 +38,7 @@ namespace igl { Eigen::SparseMatrix &G); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "gradMat.cpp" #endif diff --git a/include/igl/group_sum_matrix.cpp b/include/igl/group_sum_matrix.cpp index 8ffc1f325..61d966e2c 100644 --- a/include/igl/group_sum_matrix.cpp +++ b/include/igl/group_sum_matrix.cpp @@ -39,7 +39,7 @@ IGL_INLINE void igl::group_sum_matrix( return group_sum_matrix(G,G.maxCoeff()+1,A); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::group_sum_matrix(Eigen::Matrix const&, int, Eigen::SparseMatrix&); template void igl::group_sum_matrix(Eigen::Matrix const&, Eigen::SparseMatrix&); diff --git a/include/igl/group_sum_matrix.h b/include/igl/group_sum_matrix.h index 024e2cc0d..805544b0b 100644 --- a/include/igl/group_sum_matrix.h +++ b/include/igl/group_sum_matrix.h @@ -39,7 +39,7 @@ namespace igl const Eigen::Matrix & G, Eigen::SparseMatrix& A); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "group_sum_matrix.cpp" #endif #endif diff --git a/include/igl/harmonic.h b/include/igl/harmonic.h index 82a194227..a57355cee 100644 --- a/include/igl/harmonic.h +++ b/include/igl/harmonic.h @@ -31,7 +31,7 @@ namespace igl const int k, Eigen::MatrixXd & W); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "harmonic.cpp" #endif #endif diff --git a/include/igl/harwell_boeing.cpp b/include/igl/harwell_boeing.cpp index c5a98ace1..bbf5165eb 100644 --- a/include/igl/harwell_boeing.cpp +++ b/include/igl/harwell_boeing.cpp @@ -45,7 +45,7 @@ IGL_INLINE void igl::harwell_boeing( C[k] = column_pointer; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::harwell_boeing(Eigen::SparseMatrix const&, int&, std::vector >&, std::vector >&, std::vector >&); diff --git a/include/igl/harwell_boeing.h b/include/igl/harwell_boeing.h index 8332993ac..8f1842898 100644 --- a/include/igl/harwell_boeing.h +++ b/include/igl/harwell_boeing.h @@ -42,7 +42,7 @@ namespace igl std::vector & C); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "harwell_boeing.cpp" #endif diff --git a/include/igl/histc.cpp b/include/igl/histc.cpp index 6666e632f..d026e8349 100644 --- a/include/igl/histc.cpp +++ b/include/igl/histc.cpp @@ -98,7 +98,7 @@ IGL_INLINE void igl::histc( b = B(0); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::histc, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); template void igl::histc, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/histc.h b/include/igl/histc.h index 751fbb35c..9379c10e2 100644 --- a/include/igl/histc.h +++ b/include/igl/histc.h @@ -46,7 +46,7 @@ namespace igl typename DerivedE::Index & b); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "histc.cpp" #endif diff --git a/include/igl/hsv_to_rgb.h b/include/igl/hsv_to_rgb.h index faa3448fb..205757425 100644 --- a/include/igl/hsv_to_rgb.h +++ b/include/igl/hsv_to_rgb.h @@ -28,7 +28,7 @@ namespace igl T & r, T & g, T & b); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "hsv_to_rgb.cpp" #endif diff --git a/include/igl/igl_inline.h b/include/igl/igl_inline.h index 44335cd58..20c9630e4 100644 --- a/include/igl/igl_inline.h +++ b/include/igl/igl_inline.h @@ -11,7 +11,7 @@ #undef IGL_INLINE #endif -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # define IGL_INLINE inline #else # define IGL_INLINE diff --git a/include/igl/in_element.h b/include/igl/in_element.h index d5d6c705b..2bd3a6163 100644 --- a/include/igl/in_element.h +++ b/include/igl/in_element.h @@ -39,7 +39,7 @@ namespace igl // aabb.init(V,Ele); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "in_element.cpp" #endif diff --git a/include/igl/internal_angles.cpp b/include/igl/internal_angles.cpp index 6429a5725..9e9c5f07b 100644 --- a/include/igl/internal_angles.cpp +++ b/include/igl/internal_angles.cpp @@ -42,7 +42,7 @@ IGL_INLINE void igl::internal_angles( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::internal_angles, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/internal_angles.h b/include/igl/internal_angles.h index c39a40e41..dd2d066d1 100644 --- a/include/igl/internal_angles.h +++ b/include/igl/internal_angles.h @@ -31,7 +31,7 @@ namespace igl Eigen::PlainObjectBase & K); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "internal_angles.cpp" #endif diff --git a/include/igl/intersect.cpp b/include/igl/intersect.cpp index 52def2712..deafa05f3 100644 --- a/include/igl/intersect.cpp +++ b/include/igl/intersect.cpp @@ -44,7 +44,7 @@ IGL_INLINE M igl::intersect(const M & A, const M & B) intersect(A,B,C); return C; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template Eigen::Matrix igl::intersect >(Eigen::Matrix const&, Eigen::Matrix const&); #endif diff --git a/include/igl/intersect.h b/include/igl/intersect.h index 801f852f1..be4da91e5 100644 --- a/include/igl/intersect.h +++ b/include/igl/intersect.h @@ -26,7 +26,7 @@ namespace igl template IGL_INLINE M intersect(const M & A, const M & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "intersect.cpp" #endif #endif diff --git a/include/igl/invert_diag.cpp b/include/igl/invert_diag.cpp index b76d7e975..1080b42e5 100644 --- a/include/igl/invert_diag.cpp +++ b/include/igl/invert_diag.cpp @@ -39,7 +39,7 @@ IGL_INLINE void igl::invert_diag( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::invert_diag(Eigen::SparseMatrix const&, Eigen::SparseMatrix&); template void igl::invert_diag(Eigen::SparseMatrix const&, Eigen::SparseMatrix&); diff --git a/include/igl/invert_diag.h b/include/igl/invert_diag.h index e7bea719e..2194b3f14 100644 --- a/include/igl/invert_diag.h +++ b/include/igl/invert_diag.h @@ -28,7 +28,7 @@ namespace igl Eigen::SparseMatrix& Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "invert_diag.cpp" #endif diff --git a/include/igl/is_border_vertex.cpp b/include/igl/is_border_vertex.cpp index d031097b3..aa2339bed 100644 --- a/include/igl/is_border_vertex.cpp +++ b/include/igl/is_border_vertex.cpp @@ -29,7 +29,7 @@ IGL_INLINE std::vector igl::is_border_vertex(const Eigen::PlainObjectBase< return ret; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template std::vector > igl::is_border_vertex, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); #endif diff --git a/include/igl/is_border_vertex.h b/include/igl/is_border_vertex.h index 05b4356cd..e75552728 100644 --- a/include/igl/is_border_vertex.h +++ b/include/igl/is_border_vertex.h @@ -30,7 +30,7 @@ namespace igl const Eigen::PlainObjectBase &F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_border_vertex.cpp" #endif diff --git a/include/igl/is_dir.h b/include/igl/is_dir.h index 641d1eb00..68e30a564 100644 --- a/include/igl/is_dir.h +++ b/include/igl/is_dir.h @@ -22,7 +22,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_dir.cpp" #endif diff --git a/include/igl/is_file.h b/include/igl/is_file.h index 90d1696fb..5610c7ff3 100644 --- a/include/igl/is_file.h +++ b/include/igl/is_file.h @@ -22,7 +22,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_file.cpp" #endif diff --git a/include/igl/is_manifold.cpp b/include/igl/is_manifold.cpp index 99af36f2b..7025a06b1 100644 --- a/include/igl/is_manifold.cpp +++ b/include/igl/is_manifold.cpp @@ -43,7 +43,7 @@ IGL_INLINE bool igl::is_manifold(const Eigen::PlainObjectBase& /*V*/, return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::is_manifold, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/is_manifold.h b/include/igl/is_manifold.h index 885f238c2..4f1f36146 100644 --- a/include/igl/is_manifold.h +++ b/include/igl/is_manifold.h @@ -25,7 +25,7 @@ namespace igl const Eigen::PlainObjectBase& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_manifold.cpp" #endif diff --git a/include/igl/is_planar.h b/include/igl/is_planar.h index dfc75d04d..40aef5c05 100644 --- a/include/igl/is_planar.h +++ b/include/igl/is_planar.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE bool is_planar(const Eigen::MatrixXd & V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_planar.cpp" #endif #endif diff --git a/include/igl/is_readable.h b/include/igl/is_readable.h index 223899c8e..689701285 100644 --- a/include/igl/is_readable.h +++ b/include/igl/is_readable.h @@ -21,7 +21,7 @@ namespace igl IGL_INLINE bool is_readable(const char * filename); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_readable.cpp" #endif diff --git a/include/igl/is_sparse.cpp b/include/igl/is_sparse.cpp index f7e78caed..272ebe9b9 100644 --- a/include/igl/is_sparse.cpp +++ b/include/igl/is_sparse.cpp @@ -19,7 +19,7 @@ IGL_INLINE bool igl::is_sparse( return false; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::is_sparse(Eigen::SparseMatrix const&); diff --git a/include/igl/is_sparse.h b/include/igl/is_sparse.h index c90043f8d..9547bb8e8 100644 --- a/include/igl/is_sparse.h +++ b/include/igl/is_sparse.h @@ -28,7 +28,7 @@ namespace igl const Eigen::PlainObjectBase& A); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_sparse.cpp" #endif diff --git a/include/igl/is_symmetric.cpp b/include/igl/is_symmetric.cpp index be06496af..55847020c 100644 --- a/include/igl/is_symmetric.cpp +++ b/include/igl/is_symmetric.cpp @@ -69,7 +69,7 @@ IGL_INLINE bool igl::is_symmetric( return AmATV.maxCoeff() < epsilon && AmATV.minCoeff() > -epsilon; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::is_symmetric >(Eigen::PlainObjectBase > const&); diff --git a/include/igl/is_symmetric.h b/include/igl/is_symmetric.h index b87ff3597..31725298e 100644 --- a/include/igl/is_symmetric.h +++ b/include/igl/is_symmetric.h @@ -27,7 +27,7 @@ namespace igl const Eigen::PlainObjectBase& A); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_symmetric.cpp" #endif diff --git a/include/igl/is_writable.h b/include/igl/is_writable.h index 756e6ca98..8834e8afb 100644 --- a/include/igl/is_writable.h +++ b/include/igl/is_writable.h @@ -21,7 +21,7 @@ namespace igl IGL_INLINE bool is_writable(const char * filename); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "is_writable.cpp" #endif diff --git a/include/igl/jet.h b/include/igl/jet.h index f4529ed04..8d38a2753 100644 --- a/include/igl/jet.h +++ b/include/igl/jet.h @@ -57,7 +57,7 @@ namespace igl Eigen::PlainObjectBase & C); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "jet.cpp" #endif diff --git a/include/igl/kronecker_product.cpp b/include/igl/kronecker_product.cpp index f3f0fbe59..f592bc512 100644 --- a/include/igl/kronecker_product.cpp +++ b/include/igl/kronecker_product.cpp @@ -58,7 +58,7 @@ // return C; //} // -//#ifndef IGL_HEADER_ONLY +//#ifdef IGL_STATIC_LIBRARY //// Explicit template specialization //// generated by autoexplicit.sh //template Eigen::SparseMatrix igl::kronecker_product(Eigen::SparseMatrix const&, Eigen::SparseMatrix const&); diff --git a/include/igl/kronecker_product.h b/include/igl/kronecker_product.h index bfc7940f3..09ae802fe 100644 --- a/include/igl/kronecker_product.h +++ b/include/igl/kronecker_product.h @@ -33,7 +33,7 @@ // const Eigen::SparseMatrix & B); //} // -//#ifdef IGL_HEADER_ONLY +//#ifndef IGL_STATIC_LIBRARY //# include "kronecker_product.cpp" //#endif diff --git a/include/igl/launch_medit.cpp b/include/igl/launch_medit.cpp index 1cb111f8c..8883196b4 100644 --- a/include/igl/launch_medit.cpp +++ b/include/igl/launch_medit.cpp @@ -62,7 +62,7 @@ IGL_INLINE int igl::launch_medit( // Could clean up and delete these files but not really worth it } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template int igl::launch_medit, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, bool); #endif diff --git a/include/igl/launch_medit.h b/include/igl/launch_medit.h index 44ce78b09..8a324bb22 100644 --- a/include/igl/launch_medit.h +++ b/include/igl/launch_medit.h @@ -36,7 +36,7 @@ namespace igl const bool wait); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "launch_medit.cpp" #endif diff --git a/include/igl/lbs_matrix.h b/include/igl/lbs_matrix.h index 98014952f..307273d20 100644 --- a/include/igl/lbs_matrix.h +++ b/include/igl/lbs_matrix.h @@ -88,7 +88,7 @@ namespace igl const Eigen::MatrixXi & WI, Eigen::MatrixXd & M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "lbs_matrix.cpp" #endif #endif diff --git a/include/igl/lens_flare.h b/include/igl/lens_flare.h index efef7bef7..ec75b8088 100644 --- a/include/igl/lens_flare.h +++ b/include/igl/lens_flare.h @@ -84,7 +84,7 @@ namespace igl int & shine_tic); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "lens_flare.cpp" #endif diff --git a/include/igl/limit_faces.cpp b/include/igl/limit_faces.cpp index cbd410570..f96ba2601 100644 --- a/include/igl/limit_faces.cpp +++ b/include/igl/limit_faces.cpp @@ -58,6 +58,6 @@ IGL_INLINE void igl::limit_faces( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/limit_faces.h b/include/igl/limit_faces.h index e3cf5db63..635b89170 100644 --- a/include/igl/limit_faces.h +++ b/include/igl/limit_faces.h @@ -36,7 +36,7 @@ namespace igl MatF & LF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "limit_faces.cpp" #endif diff --git a/include/igl/line_segment_in_rectangle.h b/include/igl/line_segment_in_rectangle.h index 498612618..6d7eaf404 100644 --- a/include/igl/line_segment_in_rectangle.h +++ b/include/igl/line_segment_in_rectangle.h @@ -26,7 +26,7 @@ namespace igl const Eigen::Vector2d & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "line_segment_in_rectangle.cpp" #endif diff --git a/include/igl/list_to_matrix.cpp b/include/igl/list_to_matrix.cpp index 42be65163..fa433cc3c 100644 --- a/include/igl/list_to_matrix.cpp +++ b/include/igl/list_to_matrix.cpp @@ -92,7 +92,7 @@ IGL_INLINE bool igl::list_to_matrix(const std::vector & V,Mat & M) return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::list_to_matrix >(std::vector > const&, Eigen::Matrix&); diff --git a/include/igl/list_to_matrix.h b/include/igl/list_to_matrix.h index c8425a5bb..9dd078200 100644 --- a/include/igl/list_to_matrix.h +++ b/include/igl/list_to_matrix.h @@ -31,7 +31,7 @@ namespace igl IGL_INLINE bool list_to_matrix(const std::vector & V,Mat & M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "list_to_matrix.cpp" #endif diff --git a/include/igl/load_shader.h b/include/igl/load_shader.h index 884f2fe7e..542f30c1e 100644 --- a/include/igl/load_shader.h +++ b/include/igl/load_shader.h @@ -25,7 +25,7 @@ namespace igl IGL_INLINE GLuint load_shader(const char *src,const GLenum type); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "load_shader.cpp" #endif diff --git a/include/igl/local_basis.cpp b/include/igl/local_basis.cpp index 9faf501e5..551d338d7 100644 --- a/include/igl/local_basis.cpp +++ b/include/igl/local_basis.cpp @@ -43,7 +43,7 @@ IGL_INLINE void igl::local_basis( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh #endif diff --git a/include/igl/local_basis.h b/include/igl/local_basis.h index e11c8dd41..f1802f7fb 100644 --- a/include/igl/local_basis.h +++ b/include/igl/local_basis.h @@ -39,7 +39,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "local_basis.cpp" #endif diff --git a/include/igl/lscm.cpp b/include/igl/lscm.cpp index 71f9da338..2e602b6c3 100644 --- a/include/igl/lscm.cpp +++ b/include/igl/lscm.cpp @@ -64,6 +64,6 @@ IGL_INLINE void igl::lscm( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/lscm.h b/include/igl/lscm.h index 323c1491b..6ae2ced04 100644 --- a/include/igl/lscm.h +++ b/include/igl/lscm.h @@ -41,7 +41,7 @@ namespace igl Eigen::MatrixXd& V_uv); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "lscm.cpp" #endif diff --git a/include/igl/lu_lagrange.cpp b/include/igl/lu_lagrange.cpp index 2cd653404..d20dd84d9 100644 --- a/include/igl/lu_lagrange.cpp +++ b/include/igl/lu_lagrange.cpp @@ -148,7 +148,7 @@ IGL_INLINE bool igl::lu_lagrange( #endif } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::lu_lagrange(Eigen::SparseMatrix const&, Eigen::SparseMatrix const&, Eigen::SparseMatrix&, Eigen::SparseMatrix&); #endif diff --git a/include/igl/lu_lagrange.h b/include/igl/lu_lagrange.h index 18086518e..d43304961 100644 --- a/include/igl/lu_lagrange.h +++ b/include/igl/lu_lagrange.h @@ -60,7 +60,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "lu_lagrange.cpp" #endif diff --git a/include/igl/map_vertices_to_circle.h b/include/igl/map_vertices_to_circle.h index 4415276f8..d33376cc8 100755 --- a/include/igl/map_vertices_to_circle.h +++ b/include/igl/map_vertices_to_circle.h @@ -30,7 +30,7 @@ namespace igl Eigen::MatrixXd& UV); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "map_vertices_to_circle.cpp" #endif diff --git a/include/igl/marching_cubes.cpp b/include/igl/marching_cubes.cpp index 2a69cc37c..ef0618443 100644 --- a/include/igl/marching_cubes.cpp +++ b/include/igl/marching_cubes.cpp @@ -235,7 +235,7 @@ IGL_INLINE void igl::marching_cubes(const Eigen::Matrix, Eigen::Matrix >(Eigen::Matrix::Scalar, -1, 1, 0, -1, 1> const&, Eigen::Matrix::Scalar, -1, 3, 0, -1, 3> const&, unsigned int, unsigned int, unsigned int, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); template void igl::marching_cubes, Eigen::Matrix >(Eigen::Matrix::Scalar, -1, 1, 0, -1, 1> const&, Eigen::Matrix::Scalar, -1, 3, 0, -1, 3> const&, unsigned int, unsigned int, unsigned int, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/marching_cubes.h b/include/igl/marching_cubes.h index 88387ced3..ee2d6f63d 100644 --- a/include/igl/marching_cubes.h +++ b/include/igl/marching_cubes.h @@ -45,7 +45,7 @@ namespace igl Eigen::PlainObjectBase &faces); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "marching_cubes.cpp" #endif diff --git a/include/igl/massmatrix.cpp b/include/igl/massmatrix.cpp index fee377f4f..f04657bc9 100644 --- a/include/igl/massmatrix.cpp +++ b/include/igl/massmatrix.cpp @@ -158,7 +158,7 @@ IGL_INLINE void igl::massmatrix( sparse(MI,MJ,MV,n,n,M); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::massmatrix, Eigen::Matrix, double>(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, igl::MassMatrixType, Eigen::SparseMatrix&); #endif diff --git a/include/igl/massmatrix.h b/include/igl/massmatrix.h index 867c5a0eb..69d8dc960 100644 --- a/include/igl/massmatrix.h +++ b/include/igl/massmatrix.h @@ -53,7 +53,7 @@ namespace igl Eigen::SparseMatrix& M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "massmatrix.cpp" #endif diff --git a/include/igl/mat_max.cpp b/include/igl/mat_max.cpp index de823c745..ee8db4ed3 100644 --- a/include/igl/mat_max.cpp +++ b/include/igl/mat_max.cpp @@ -40,7 +40,7 @@ IGL_INLINE void igl::mat_max( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::mat_max(Eigen::Matrix const&, int, Eigen::Matrix&, Eigen::Matrix&); #endif diff --git a/include/igl/mat_max.h b/include/igl/mat_max.h index 35cddacbd..40db25b4e 100644 --- a/include/igl/mat_max.h +++ b/include/igl/mat_max.h @@ -37,7 +37,7 @@ namespace igl Eigen::Matrix & I); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mat_max.cpp" #endif diff --git a/include/igl/mat_min.cpp b/include/igl/mat_min.cpp index b1cb419e1..9adca15b6 100644 --- a/include/igl/mat_min.cpp +++ b/include/igl/mat_min.cpp @@ -51,7 +51,7 @@ IGL_INLINE void igl::mat_min( // return Y; //} -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::mat_min(Eigen::Matrix const&, int, Eigen::Matrix&, Eigen::Matrix&); diff --git a/include/igl/mat_min.h b/include/igl/mat_min.h index d650d482d..11c766a19 100644 --- a/include/igl/mat_min.h +++ b/include/igl/mat_min.h @@ -45,7 +45,7 @@ namespace igl // const int dim); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mat_min.cpp" #endif diff --git a/include/igl/mat_to_quat.cpp b/include/igl/mat_to_quat.cpp index 16fc9786c..91b374c20 100644 --- a/include/igl/mat_to_quat.cpp +++ b/include/igl/mat_to_quat.cpp @@ -133,7 +133,7 @@ IGL_INLINE void igl::mat3_to_quat(const Q_type * mat, Q_type * q) -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::mat4_to_quat(double const*, double*); template void igl::mat4_to_quat(float const*, float*); diff --git a/include/igl/mat_to_quat.h b/include/igl/mat_to_quat.h index c13135e9f..acea683f7 100644 --- a/include/igl/mat_to_quat.h +++ b/include/igl/mat_to_quat.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE void mat3_to_quat(const Q_type * m, Q_type * q); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mat_to_quat.cpp" #endif diff --git a/include/igl/matlab/matlabinterface.h b/include/igl/matlab/matlabinterface.h index ccd3ba96c..e066737c7 100644 --- a/include/igl/matlab/matlabinterface.h +++ b/include/igl/matlab/matlabinterface.h @@ -80,7 +80,7 @@ namespace igl } // Be sure that this is not compiled into libigl.a -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "matlabinterface.cpp" #endif diff --git a/include/igl/matlab/mexErrMsgTxt.h b/include/igl/matlab/mexErrMsgTxt.h index 7a0542ae6..10a3a5ea5 100644 --- a/include/igl/matlab/mexErrMsgTxt.h +++ b/include/igl/matlab/mexErrMsgTxt.h @@ -13,7 +13,7 @@ namespace igl // Wrapper for mexErrMsgTxt that only calls error if test fails IGL_INLINE void mexErrMsgTxt(bool test, const char * message); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mexErrMsgTxt.cpp" #endif #endif diff --git a/include/igl/matlab/mexStream.h b/include/igl/matlab/mexStream.h index 64efc6024..72874caa4 100644 --- a/include/igl/matlab/mexStream.h +++ b/include/igl/matlab/mexStream.h @@ -30,7 +30,7 @@ namespace igl inline virtual int overflow(int c = EOF); }; } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mexStream.cpp" #endif #endif diff --git a/include/igl/matlab/parse_rhs.cpp b/include/igl/matlab/parse_rhs.cpp index a8e6f6158..c484f7769 100644 --- a/include/igl/matlab/parse_rhs.cpp +++ b/include/igl/matlab/parse_rhs.cpp @@ -25,7 +25,7 @@ IGL_INLINE void igl::parse_rhs_index( V.array() -= 1; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::parse_rhs_index >(mxArray_tag const**, Eigen::PlainObjectBase >&); template void igl::parse_rhs_index >(mxArray_tag const**, Eigen::PlainObjectBase >&); template void igl::parse_rhs_double >(mxArray_tag const**, Eigen::PlainObjectBase >&); diff --git a/include/igl/matlab/parse_rhs.h b/include/igl/matlab/parse_rhs.h index d6efda52d..f27f45a75 100644 --- a/include/igl/matlab/parse_rhs.h +++ b/include/igl/matlab/parse_rhs.h @@ -21,7 +21,7 @@ namespace igl const mxArray *prhs[], Eigen::PlainObjectBase & V); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "parse_rhs.cpp" #endif #endif diff --git a/include/igl/matlab/prepare_lhs.cpp b/include/igl/matlab/prepare_lhs.cpp index 3f2175e09..a3069e9af 100644 --- a/include/igl/matlab/prepare_lhs.cpp +++ b/include/igl/matlab/prepare_lhs.cpp @@ -22,7 +22,7 @@ IGL_INLINE void igl::prepare_lhs_index( return prepare_lhs_double(Vd,plhs); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::prepare_lhs_index >(Eigen::PlainObjectBase > const&, mxArray_tag**); template void igl::prepare_lhs_index >(Eigen::PlainObjectBase > const&, mxArray_tag**); template void igl::prepare_lhs_double >(Eigen::PlainObjectBase > const&, mxArray_tag**); diff --git a/include/igl/matlab/prepare_lhs.h b/include/igl/matlab/prepare_lhs.h index 6b8aa5884..4aab990f4 100644 --- a/include/igl/matlab/prepare_lhs.h +++ b/include/igl/matlab/prepare_lhs.h @@ -21,7 +21,7 @@ namespace igl const Eigen::PlainObjectBase & V, mxArray *plhs[]); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "prepare_lhs.cpp" #endif #endif diff --git a/include/igl/matlab_format.cpp b/include/igl/matlab_format.cpp index 598b8e23f..4a91885eb 100644 --- a/include/igl/matlab_format.cpp +++ b/include/igl/matlab_format.cpp @@ -93,7 +93,7 @@ IGL_INLINE Eigen::IOFormat igl::matlab_format() "\n];"); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template Eigen::WithFormat > const igl::matlab_format >(Eigen::PlainObjectBase > const&, std::basic_string, std::allocator >); diff --git a/include/igl/matlab_format.h b/include/igl/matlab_format.h index 28ddf2b17..ba3814608 100644 --- a/include/igl/matlab_format.h +++ b/include/igl/matlab_format.h @@ -75,7 +75,7 @@ namespace igl IGL_INLINE Eigen::IOFormat matlab_format(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "matlab_format.cpp" #endif diff --git a/include/igl/matrix_to_list.cpp b/include/igl/matrix_to_list.cpp index e2b0f3f26..ceecb981e 100644 --- a/include/igl/matrix_to_list.cpp +++ b/include/igl/matrix_to_list.cpp @@ -53,7 +53,7 @@ IGL_INLINE std::vector igl::matrix_to_list( return V; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template std::vector::Scalar, std::allocator::Scalar> > igl::matrix_to_list >(Eigen::MatrixBase > const&); diff --git a/include/igl/matrix_to_list.h b/include/igl/matrix_to_list.h index 4e918723d..c5a61ba53 100644 --- a/include/igl/matrix_to_list.h +++ b/include/igl/matrix_to_list.h @@ -40,7 +40,7 @@ namespace igl const Eigen::MatrixBase & M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "matrix_to_list.cpp" #endif diff --git a/include/igl/max_size.cpp b/include/igl/max_size.cpp index 91a699be6..24b0f2bf2 100644 --- a/include/igl/max_size.cpp +++ b/include/igl/max_size.cpp @@ -24,7 +24,7 @@ IGL_INLINE int igl::max_size(const std::vector & V) } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template int igl::max_size > >(std::vector >, std::allocator > > > const&); diff --git a/include/igl/max_size.h b/include/igl/max_size.h index 529dc529b..58035d4ce 100644 --- a/include/igl/max_size.h +++ b/include/igl/max_size.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE int max_size(const std::vector & V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "max_size.cpp" #endif diff --git a/include/igl/median.h b/include/igl/median.h index d2a730b09..5f06486d7 100644 --- a/include/igl/median.h +++ b/include/igl/median.h @@ -21,7 +21,7 @@ namespace igl IGL_INLINE bool median(const Eigen::VectorXd & V, double & m); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "median.cpp" #endif diff --git a/include/igl/min_quad_dense.cpp b/include/igl/min_quad_dense.cpp index 11ba8ed79..b2c429c87 100644 --- a/include/igl/min_quad_dense.cpp +++ b/include/igl/min_quad_dense.cpp @@ -91,7 +91,7 @@ IGL_INLINE void igl::min_quad_dense_precompute( //int hu = 1; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::min_quad_dense_precompute(Eigen::Matrix const&, Eigen::Matrix const&, bool, Eigen::Matrix&); #endif diff --git a/include/igl/min_quad_dense.h b/include/igl/min_quad_dense.h index 7fc10a453..3d115168a 100644 --- a/include/igl/min_quad_dense.h +++ b/include/igl/min_quad_dense.h @@ -40,7 +40,7 @@ namespace igl Eigen::Matrix& S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "min_quad_dense.cpp" #endif diff --git a/include/igl/min_quad_with_fixed.cpp b/include/igl/min_quad_with_fixed.cpp index 995c3505f..1da94d52e 100644 --- a/include/igl/min_quad_with_fixed.cpp +++ b/include/igl/min_quad_with_fixed.cpp @@ -536,7 +536,7 @@ IGL_INLINE bool igl::min_quad_with_fixed_solve( return min_quad_with_fixed_solve(data,B,Y,Beq,Z,sol); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::min_quad_with_fixed_solve, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(igl::min_quad_with_fixed_data const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template bool igl::min_quad_with_fixed_precompute >(Eigen::SparseMatrix const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix const&, bool, igl::min_quad_with_fixed_data&); diff --git a/include/igl/min_quad_with_fixed.h b/include/igl/min_quad_with_fixed.h index bbe39c9be..1fd0c39ca 100644 --- a/include/igl/min_quad_with_fixed.h +++ b/include/igl/min_quad_with_fixed.h @@ -155,7 +155,7 @@ struct igl::min_quad_with_fixed_data Eigen::Matrix NB; }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "min_quad_with_fixed.cpp" #endif diff --git a/include/igl/min_size.cpp b/include/igl/min_size.cpp index eb0505716..6913a489f 100644 --- a/include/igl/min_size.cpp +++ b/include/igl/min_size.cpp @@ -30,7 +30,7 @@ IGL_INLINE int igl::min_size(const std::vector & V) -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template int igl::min_size > >(std::vector >, std::allocator > > > const&); diff --git a/include/igl/min_size.h b/include/igl/min_size.h index eabc4828d..e44036279 100644 --- a/include/igl/min_size.h +++ b/include/igl/min_size.h @@ -23,7 +23,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "min_size.cpp" #endif diff --git a/include/igl/mode.cpp b/include/igl/mode.cpp index e84e19a05..4591c6200 100644 --- a/include/igl/mode.cpp +++ b/include/igl/mode.cpp @@ -53,7 +53,7 @@ IGL_INLINE void igl::mode( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::mode(Eigen::Matrix const&, int, Eigen::Matrix&); diff --git a/include/igl/mode.h b/include/igl/mode.h index a84ed34e1..4d0943881 100644 --- a/include/igl/mode.h +++ b/include/igl/mode.h @@ -28,7 +28,7 @@ namespace igl Eigen::Matrix & M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mode.cpp" #endif diff --git a/include/igl/mosek/mosek_guarded.h b/include/igl/mosek/mosek_guarded.h index b5dfebd48..a7f2e84fa 100644 --- a/include/igl/mosek/mosek_guarded.h +++ b/include/igl/mosek/mosek_guarded.h @@ -20,7 +20,7 @@ namespace igl IGL_INLINE MSKrescodee mosek_guarded(const MSKrescodee r); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mosek_guarded.cpp" #endif diff --git a/include/igl/mosek/mosek_quadprog.cpp b/include/igl/mosek/mosek_quadprog.cpp index 44b4746b0..5f62ae7b2 100644 --- a/include/igl/mosek/mosek_quadprog.cpp +++ b/include/igl/mosek/mosek_quadprog.cpp @@ -332,6 +332,6 @@ IGL_INLINE bool igl::mosek_quadprog( list_to_matrix(vx,x); return ret; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template declarations #endif diff --git a/include/igl/mosek/mosek_quadprog.h b/include/igl/mosek/mosek_quadprog.h index 73796139a..5ed86716f 100644 --- a/include/igl/mosek/mosek_quadprog.h +++ b/include/igl/mosek/mosek_quadprog.h @@ -120,7 +120,7 @@ namespace igl Eigen::VectorXd & x); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mosek_quadprog.cpp" #endif diff --git a/include/igl/moveFV.cpp b/include/igl/moveFV.cpp index 7f426c051..7205179da 100644 --- a/include/igl/moveFV.cpp +++ b/include/igl/moveFV.cpp @@ -29,6 +29,6 @@ IGL_INLINE void igl::moveFV(const Eigen::Matrix &SV); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "moveFV.cpp" #endif diff --git a/include/igl/moveVF.cpp b/include/igl/moveVF.cpp index 4e3635351..5fa6e89ec 100644 --- a/include/igl/moveVF.cpp +++ b/include/igl/moveVF.cpp @@ -24,6 +24,6 @@ IGL_INLINE void igl::moveVF(const Eigen::Matrix &SF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "moveVF.cpp" #endif diff --git a/include/igl/mvc.h b/include/igl/mvc.h index 754cb1c66..3c7c2abcc 100644 --- a/include/igl/mvc.h +++ b/include/igl/mvc.h @@ -33,7 +33,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mvc.cpp" #endif diff --git a/include/igl/normalize_quat.cpp b/include/igl/normalize_quat.cpp index de316cfe2..39a5dfd04 100644 --- a/include/igl/normalize_quat.cpp +++ b/include/igl/normalize_quat.cpp @@ -32,7 +32,7 @@ IGL_INLINE bool igl::normalize_quat( return (len > igl::EPS()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::normalize_quat(double const*, double*); diff --git a/include/igl/normalize_quat.h b/include/igl/normalize_quat.h index 638bf46d1..e97759b17 100644 --- a/include/igl/normalize_quat.h +++ b/include/igl/normalize_quat.h @@ -25,7 +25,7 @@ namespace igl Q_type *out); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "normalize_quat.cpp" #endif diff --git a/include/igl/normalize_row_lengths.cpp b/include/igl/normalize_row_lengths.cpp index 4c90c6c34..2ce3a0bd2 100644 --- a/include/igl/normalize_row_lengths.cpp +++ b/include/igl/normalize_row_lengths.cpp @@ -24,7 +24,7 @@ IGL_INLINE void igl::normalize_row_lengths( //B = A; //B.rowwise().normalize(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::normalize_row_lengths >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/normalize_row_lengths.h b/include/igl/normalize_row_lengths.h index ebb228b1c..c305c0f65 100644 --- a/include/igl/normalize_row_lengths.h +++ b/include/igl/normalize_row_lengths.h @@ -30,7 +30,7 @@ namespace igl Eigen::PlainObjectBase & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "normalize_row_lengths.cpp" #endif diff --git a/include/igl/normalize_row_sums.cpp b/include/igl/normalize_row_sums.cpp index 648ab7e64..32f8deafd 100644 --- a/include/igl/normalize_row_sums.cpp +++ b/include/igl/normalize_row_sums.cpp @@ -22,7 +22,7 @@ IGL_INLINE void igl::normalize_row_sums( #endif B = (A.array().colwise() / A.rowwise().sum().array()).eval(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::normalize_row_sums, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase >&); template void igl::normalize_row_sums, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase >&); diff --git a/include/igl/normalize_row_sums.h b/include/igl/normalize_row_sums.h index d4bb9cc8d..a832e82a6 100644 --- a/include/igl/normalize_row_sums.h +++ b/include/igl/normalize_row_sums.h @@ -26,7 +26,7 @@ namespace igl Eigen::MatrixBase & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "normalize_row_sums.cpp" #endif diff --git a/include/igl/on_boundary.cpp b/include/igl/on_boundary.cpp index ba3383b97..c60bdf648 100644 --- a/include/igl/on_boundary.cpp +++ b/include/igl/on_boundary.cpp @@ -90,7 +90,7 @@ IGL_INLINE void igl::on_boundary( #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::on_boundary, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/on_boundary.h b/include/igl/on_boundary.h index 7101db915..d624c112a 100644 --- a/include/igl/on_boundary.h +++ b/include/igl/on_boundary.h @@ -47,7 +47,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "on_boundary.cpp" #endif diff --git a/include/igl/orient_outward.cpp b/include/igl/orient_outward.cpp index 7bb877898..012f9c9a8 100644 --- a/include/igl/orient_outward.cpp +++ b/include/igl/orient_outward.cpp @@ -89,7 +89,7 @@ IGL_INLINE void igl::orient_outward( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::orient_outward, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/orient_outward.h b/include/igl/orient_outward.h index b0b49328b..40037aa33 100644 --- a/include/igl/orient_outward.h +++ b/include/igl/orient_outward.h @@ -36,7 +36,7 @@ namespace igl Eigen::PlainObjectBase & I); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "orient_outward.cpp" #endif diff --git a/include/igl/orth.h b/include/igl/orth.h index d2e18b965..a77cd6593 100644 --- a/include/igl/orth.h +++ b/include/igl/orth.h @@ -36,7 +36,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "orth.cpp" #endif #endif diff --git a/include/igl/partition.h b/include/igl/partition.h index 90afe5539..167ebd0d7 100644 --- a/include/igl/partition.h +++ b/include/igl/partition.h @@ -33,7 +33,7 @@ namespace igl Eigen::Matrix & D); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "partition.cpp" #endif #endif diff --git a/include/igl/path_to_executable.h b/include/igl/path_to_executable.h index 291d3a98c..169c3400b 100644 --- a/include/igl/path_to_executable.h +++ b/include/igl/path_to_executable.h @@ -15,7 +15,7 @@ namespace igl // Note: Tested for Mac OS X IGL_INLINE std::string path_to_executable(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "path_to_executable.cpp" #endif #endif diff --git a/include/igl/pathinfo.cpp b/include/igl/pathinfo.cpp index ce8e301e9..503860d12 100644 --- a/include/igl/pathinfo.cpp +++ b/include/igl/pathinfo.cpp @@ -42,6 +42,6 @@ IGL_INLINE void igl::pathinfo( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/pathinfo.h b/include/igl/pathinfo.h index 9b3eb42d6..6419589ad 100644 --- a/include/igl/pathinfo.h +++ b/include/igl/pathinfo.h @@ -40,7 +40,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "pathinfo.cpp" #endif diff --git a/include/igl/per_corner_normals.cpp b/include/igl/per_corner_normals.cpp index 49e067d27..2236ee0df 100644 --- a/include/igl/per_corner_normals.cpp +++ b/include/igl/per_corner_normals.cpp @@ -95,7 +95,7 @@ IGL_INLINE void igl::per_corner_normals( } } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::per_corner_normals, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, double, Eigen::PlainObjectBase >&); diff --git a/include/igl/per_corner_normals.h b/include/igl/per_corner_normals.h index 95674e0ee..54b3992c0 100644 --- a/include/igl/per_corner_normals.h +++ b/include/igl/per_corner_normals.h @@ -52,7 +52,7 @@ namespace igl Eigen::PlainObjectBase & CN); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "per_corner_normals.cpp" #endif diff --git a/include/igl/per_face_normals.cpp b/include/igl/per_face_normals.cpp index 7c42d4f8c..013f18ada 100644 --- a/include/igl/per_face_normals.cpp +++ b/include/igl/per_face_normals.cpp @@ -47,7 +47,7 @@ IGL_INLINE void igl::per_face_normals( return per_face_normals(V,F,Z,N); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::per_face_normals, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::per_face_normals, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/per_face_normals.h b/include/igl/per_face_normals.h index 589495898..2713d93f3 100644 --- a/include/igl/per_face_normals.h +++ b/include/igl/per_face_normals.h @@ -37,7 +37,7 @@ namespace igl Eigen::PlainObjectBase & N); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "per_face_normals.cpp" #endif diff --git a/include/igl/per_vertex_attribute_smoothing.h b/include/igl/per_vertex_attribute_smoothing.h index b1a795d69..662810236 100644 --- a/include/igl/per_vertex_attribute_smoothing.h +++ b/include/igl/per_vertex_attribute_smoothing.h @@ -25,7 +25,7 @@ namespace igl Eigen::PlainObjectBase & Aout); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "per_vertex_attribute_smoothing.cpp" #endif diff --git a/include/igl/per_vertex_normals.cpp b/include/igl/per_vertex_normals.cpp index b45408be4..9e3a08890 100644 --- a/include/igl/per_vertex_normals.cpp +++ b/include/igl/per_vertex_normals.cpp @@ -50,7 +50,7 @@ IGL_INLINE void igl::per_vertex_normals( N.rowwise().normalize(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::per_vertex_normals, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/per_vertex_normals.h b/include/igl/per_vertex_normals.h index 78bcd2fac..b8a844fe0 100644 --- a/include/igl/per_vertex_normals.h +++ b/include/igl/per_vertex_normals.h @@ -37,7 +37,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "per_vertex_normals.cpp" #endif diff --git a/include/igl/planarize_quad_mesh.h b/include/igl/planarize_quad_mesh.h index bdfe654d0..2aa170d5e 100644 --- a/include/igl/planarize_quad_mesh.h +++ b/include/igl/planarize_quad_mesh.h @@ -32,7 +32,7 @@ namespace igl const double &threshold, Eigen::PlainObjectBase &Vout); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "planarize_quad_mesh.cpp" #endif diff --git a/include/igl/plane_project.cpp b/include/igl/plane_project.cpp index fc5f6277c..9195be8d1 100644 --- a/include/igl/plane_project.cpp +++ b/include/igl/plane_project.cpp @@ -51,6 +51,6 @@ IGL_INLINE void igl::plane_project( I.setFromTriplets(ijv.begin(),ijv.end()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::plane_project, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, double>(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::SparseMatrix&); #endif diff --git a/include/igl/plane_project.h b/include/igl/plane_project.h index cace1e604..9dd3be0ee 100644 --- a/include/igl/plane_project.h +++ b/include/igl/plane_project.h @@ -40,7 +40,7 @@ namespace igl Eigen::SparseMatrix& I); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "plane_project.cpp" #endif diff --git a/include/igl/plot_vector.cpp b/include/igl/plot_vector.cpp index 5170c3e44..1247c60d2 100644 --- a/include/igl/plot_vector.cpp +++ b/include/igl/plot_vector.cpp @@ -54,6 +54,6 @@ IGL_INLINE void igl::plot_vector( std::vector< std::vector< std::vector > >& } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/plot_vector.h b/include/igl/plot_vector.h index b7d4dcd9c..819676f3e 100644 --- a/include/igl/plot_vector.h +++ b/include/igl/plot_vector.h @@ -22,7 +22,7 @@ namespace igl IGL_INLINE void plot_vector(std::vector< std::vector< std::vector > >& v); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "plot_vector.cpp" #endif diff --git a/include/igl/png/render_to_png.h b/include/igl/png/render_to_png.h index 54e89d90a..31252ea66 100644 --- a/include/igl/png/render_to_png.h +++ b/include/igl/png/render_to_png.h @@ -31,7 +31,7 @@ namespace igl const bool fast = false); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "render_to_png.cpp" #endif diff --git a/include/igl/png/render_to_png_async.h b/include/igl/png/render_to_png_async.h index eddec89a7..1de9e9f4f 100644 --- a/include/igl/png/render_to_png_async.h +++ b/include/igl/png/render_to_png_async.h @@ -35,7 +35,7 @@ namespace igl const bool fast = false); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "render_to_png_async.cpp" #endif diff --git a/include/igl/png/texture_from_file.h b/include/igl/png/texture_from_file.h index 6e1bf66c7..fade671e7 100644 --- a/include/igl/png/texture_from_file.h +++ b/include/igl/png/texture_from_file.h @@ -28,7 +28,7 @@ namespace igl IGL_INLINE bool texture_from_file(const std::string filename, GLuint & id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "texture_from_file.cpp" #endif diff --git a/include/igl/png/texture_from_png.h b/include/igl/png/texture_from_png.h index 0ea74cc3f..0b14099c7 100644 --- a/include/igl/png/texture_from_png.h +++ b/include/igl/png/texture_from_png.h @@ -26,7 +26,7 @@ namespace igl IGL_INLINE bool texture_from_png(const std::string png_file, GLuint & id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "texture_from_png.cpp" #endif diff --git a/include/igl/point_in_circle.h b/include/igl/point_in_circle.h index 946ed93ae..f19344c40 100644 --- a/include/igl/point_in_circle.h +++ b/include/igl/point_in_circle.h @@ -27,7 +27,7 @@ namespace igl const double r); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "point_in_circle.cpp" #endif diff --git a/include/igl/point_in_poly.h b/include/igl/point_in_poly.h index 7aca82dee..2b9c6e51b 100644 --- a/include/igl/point_in_poly.h +++ b/include/igl/point_in_poly.h @@ -29,7 +29,7 @@ bool IGL_INLINE point_in_poly( const std::vector >&po } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "point_in_poly.cpp" #endif diff --git a/include/igl/polar_dec.cpp b/include/igl/polar_dec.cpp index 59028d53a..d5f6c8662 100644 --- a/include/igl/polar_dec.cpp +++ b/include/igl/polar_dec.cpp @@ -89,7 +89,7 @@ IGL_INLINE void igl::polar_dec( return igl::polar_dec(A,R,T,U,S,V); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::polar_dec, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/polar_dec.h b/include/igl/polar_dec.h index 72e2a9e22..2b995eabe 100644 --- a/include/igl/polar_dec.h +++ b/include/igl/polar_dec.h @@ -46,7 +46,7 @@ namespace igl Eigen::PlainObjectBase & R, Eigen::PlainObjectBase & T); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "polar_dec.cpp" #endif #endif diff --git a/include/igl/polar_svd.cpp b/include/igl/polar_svd.cpp index b3a5b3fd9..8ba2fd698 100644 --- a/include/igl/polar_svd.cpp +++ b/include/igl/polar_svd.cpp @@ -63,7 +63,7 @@ IGL_INLINE void igl::polar_svd( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::polar_svd, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); template void igl::polar_svd, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/polar_svd.h b/include/igl/polar_svd.h index 90e227338..13d3f3873 100644 --- a/include/igl/polar_svd.h +++ b/include/igl/polar_svd.h @@ -48,7 +48,7 @@ namespace igl Eigen::PlainObjectBase & R, Eigen::PlainObjectBase & T); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "polar_svd.cpp" #endif #endif diff --git a/include/igl/polygon_mesh_to_triangle_mesh.cpp b/include/igl/polygon_mesh_to_triangle_mesh.cpp index 05fe88506..e5446a8f4 100644 --- a/include/igl/polygon_mesh_to_triangle_mesh.cpp +++ b/include/igl/polygon_mesh_to_triangle_mesh.cpp @@ -54,7 +54,7 @@ IGL_INLINE void igl::polygon_mesh_to_triangle_mesh( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::polygon_mesh_to_triangle_mesh >(std::vector >, std::allocator > > > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/polygon_mesh_to_triangle_mesh.h b/include/igl/polygon_mesh_to_triangle_mesh.h index 7539b769f..58291856f 100644 --- a/include/igl/polygon_mesh_to_triangle_mesh.h +++ b/include/igl/polygon_mesh_to_triangle_mesh.h @@ -37,7 +37,7 @@ namespace igl Eigen::PlainObjectBase& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "polygon_mesh_to_triangle_mesh.cpp" #endif diff --git a/include/igl/principal_curvature.cpp b/include/igl/principal_curvature.cpp index f236245af..d5acc72a3 100644 --- a/include/igl/principal_curvature.cpp +++ b/include/igl/principal_curvature.cpp @@ -842,7 +842,7 @@ IGL_INLINE void igl::principal_curvature( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::principal_curvature, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, unsigned int, bool); diff --git a/include/igl/principal_curvature.h b/include/igl/principal_curvature.h index 13c37ee7c..7f70d3e93 100644 --- a/include/igl/principal_curvature.h +++ b/include/igl/principal_curvature.h @@ -65,7 +65,7 @@ IGL_INLINE void principal_curvature( } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "principal_curvature.cpp" #endif diff --git a/include/igl/print_gl_get.h b/include/igl/print_gl_get.h index 6db329f48..738c2cda0 100644 --- a/include/igl/print_gl_get.h +++ b/include/igl/print_gl_get.h @@ -20,7 +20,7 @@ namespace igl IGL_INLINE void print_gl_get(GLenum pname); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "print_gl_get.cpp" #endif diff --git a/include/igl/print_ijv.cpp b/include/igl/print_ijv.cpp index cb5b2c450..6127dfb67 100644 --- a/include/igl/print_ijv.cpp +++ b/include/igl/print_ijv.cpp @@ -33,7 +33,7 @@ IGL_INLINE void igl::print_ijv( std::cout<(Eigen::SparseMatrix const&, int); diff --git a/include/igl/print_ijv.h b/include/igl/print_ijv.h index b9bb0408f..e45c1a76c 100644 --- a/include/igl/print_ijv.h +++ b/include/igl/print_ijv.h @@ -28,7 +28,7 @@ namespace igl const int offset=0); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "print_ijv.cpp" #endif diff --git a/include/igl/print_program_info_log.h b/include/igl/print_program_info_log.h index 04ec05ef8..66f7a71e1 100644 --- a/include/igl/print_program_info_log.h +++ b/include/igl/print_program_info_log.h @@ -19,7 +19,7 @@ namespace igl IGL_INLINE void print_program_info_log(const GLuint obj); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "print_program_info_log.cpp" #endif diff --git a/include/igl/print_shader_info_log.h b/include/igl/print_shader_info_log.h index 42efdac4c..6e6ea463f 100644 --- a/include/igl/print_shader_info_log.h +++ b/include/igl/print_shader_info_log.h @@ -19,7 +19,7 @@ namespace igl IGL_INLINE void print_shader_info_log(const GLuint obj); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "print_shader_info_log.cpp" #endif diff --git a/include/igl/project.cpp b/include/igl/project.cpp index bd5d35f37..10e4de3e6 100644 --- a/include/igl/project.cpp +++ b/include/igl/project.cpp @@ -110,7 +110,7 @@ IGL_INLINE Eigen::PlainObjectBase igl::project( return win; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciations template int igl::project, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template Eigen::PlainObjectBase > igl::project >(Eigen::PlainObjectBase > const&); diff --git a/include/igl/project.h b/include/igl/project.h index e2dee43f4..69c1a349e 100644 --- a/include/igl/project.h +++ b/include/igl/project.h @@ -36,7 +36,7 @@ namespace igl const Eigen::PlainObjectBase & obj); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "project.cpp" #endif diff --git a/include/igl/project_to_line.cpp b/include/igl/project_to_line.cpp index 9d4b89785..3ac48c28e 100644 --- a/include/igl/project_to_line.cpp +++ b/include/igl/project_to_line.cpp @@ -117,7 +117,7 @@ IGL_INLINE void igl::project_to_line( projpx, projpy, projpz, t, sqrd); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::project_to_line, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::Matrix const&, Eigen::Matrix const&, Eigen::Matrix const&, Eigen::Matrix&, Eigen::Matrix&); template void igl::project_to_line(double, double, double, double, double, double, double, double, double, double&, double&); diff --git a/include/igl/project_to_line.h b/include/igl/project_to_line.h index dc280cb5a..73ca0b8b5 100644 --- a/include/igl/project_to_line.h +++ b/include/igl/project_to_line.h @@ -79,7 +79,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "project_to_line.cpp" #endif diff --git a/include/igl/project_to_line_segment.cpp b/include/igl/project_to_line_segment.cpp index 136cc8e3f..cc79308cc 100644 --- a/include/igl/project_to_line_segment.cpp +++ b/include/igl/project_to_line_segment.cpp @@ -40,7 +40,7 @@ IGL_INLINE void igl::project_to_line_segment( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::project_to_line_segment, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/project_to_line_segment.h b/include/igl/project_to_line_segment.h index 16d837b64..5db64585e 100644 --- a/include/igl/project_to_line_segment.h +++ b/include/igl/project_to_line_segment.h @@ -42,7 +42,7 @@ namespace igl Eigen::PlainObjectBase & sqrD); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "project_to_line_segment.cpp" #endif diff --git a/include/igl/quad_planarity.cpp b/include/igl/quad_planarity.cpp index 4e461df29..711930bbe 100644 --- a/include/igl/quad_planarity.cpp +++ b/include/igl/quad_planarity.cpp @@ -25,6 +25,6 @@ IGL_INLINE void igl::quad_planarity( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/quad_planarity.h b/include/igl/quad_planarity.h index 7b808dac6..c789f4127 100644 --- a/include/igl/quad_planarity.h +++ b/include/igl/quad_planarity.h @@ -18,7 +18,7 @@ namespace igl Eigen::PlainObjectBase & P); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quad_planarity.cpp" #endif diff --git a/include/igl/quat_conjugate.cpp b/include/igl/quat_conjugate.cpp index 1a1db2e07..178350d95 100644 --- a/include/igl/quat_conjugate.cpp +++ b/include/igl/quat_conjugate.cpp @@ -18,7 +18,7 @@ IGL_INLINE void igl::quat_conjugate( out[3] = q1[3]; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::quat_conjugate(double const*, double*); diff --git a/include/igl/quat_conjugate.h b/include/igl/quat_conjugate.h index a81609613..32ccb3b5b 100644 --- a/include/igl/quat_conjugate.h +++ b/include/igl/quat_conjugate.h @@ -25,7 +25,7 @@ namespace igl Q_type *out); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quat_conjugate.cpp" #endif diff --git a/include/igl/quat_mult.cpp b/include/igl/quat_mult.cpp index 7bab42693..7eaa02590 100644 --- a/include/igl/quat_mult.cpp +++ b/include/igl/quat_mult.cpp @@ -25,7 +25,7 @@ IGL_INLINE void igl::quat_mult( out[3] = q1[3]*q2[3] - (q1[0]*q2[0] + q1[1]*q2[1] + q1[2]*q2[2]); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::quat_mult(double const*, double const*, double*); diff --git a/include/igl/quat_mult.h b/include/igl/quat_mult.h index d92c527b8..4a7ba654f 100644 --- a/include/igl/quat_mult.h +++ b/include/igl/quat_mult.h @@ -26,7 +26,7 @@ namespace igl Q_type *out); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quat_mult.cpp" #endif diff --git a/include/igl/quat_to_axis_angle.h b/include/igl/quat_to_axis_angle.h index a633cfa76..77ea10e5c 100644 --- a/include/igl/quat_to_axis_angle.h +++ b/include/igl/quat_to_axis_angle.h @@ -32,7 +32,7 @@ namespace igl Q_type & angle); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quat_to_axis_angle.cpp" #endif diff --git a/include/igl/quat_to_mat.cpp b/include/igl/quat_to_mat.cpp index 4da4364ff..370e4fe29 100644 --- a/include/igl/quat_to_mat.cpp +++ b/include/igl/quat_to_mat.cpp @@ -35,7 +35,7 @@ IGL_INLINE void igl::quat_to_mat(const Q_type * quat, Q_type * mat) mat[3*4+3] = 1; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::quat_to_mat(double const*, double*); diff --git a/include/igl/quat_to_mat.h b/include/igl/quat_to_mat.h index 226fd105e..4291b291e 100644 --- a/include/igl/quat_to_mat.h +++ b/include/igl/quat_to_mat.h @@ -23,7 +23,7 @@ namespace igl IGL_INLINE void quat_to_mat(const Q_type * quat, Q_type * mat); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quat_to_mat.cpp" #endif diff --git a/include/igl/quats_to_column.h b/include/igl/quats_to_column.h index 876bf1ffc..4a7795ae1 100644 --- a/include/igl/quats_to_column.h +++ b/include/igl/quats_to_column.h @@ -29,7 +29,7 @@ namespace igl Eigen::Quaterniond,Eigen::aligned_allocator > vQ); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "quats_to_column.cpp" #endif diff --git a/include/igl/random_dir.h b/include/igl/random_dir.h index 8963a1d21..78027db05 100644 --- a/include/igl/random_dir.h +++ b/include/igl/random_dir.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE Eigen::MatrixXd random_dir_stratified(const int n); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "random_dir.cpp" #endif diff --git a/include/igl/random_points_on_mesh.cpp b/include/igl/random_points_on_mesh.cpp index eac1ab1a6..e8a6dbd9c 100644 --- a/include/igl/random_points_on_mesh.cpp +++ b/include/igl/random_points_on_mesh.cpp @@ -77,7 +77,7 @@ IGL_INLINE void igl::random_points_on_mesh( B.setFromTriplets(BIJV.begin(),BIJV.end()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::random_points_on_mesh, Eigen::Matrix, double, Eigen::Matrix >(int, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix&, Eigen::PlainObjectBase >&); template void igl::random_points_on_mesh, Eigen::Matrix, double, Eigen::Matrix >(int, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::SparseMatrix&, Eigen::PlainObjectBase >&); diff --git a/include/igl/random_points_on_mesh.h b/include/igl/random_points_on_mesh.h index 56162fbcc..2bb41fa77 100644 --- a/include/igl/random_points_on_mesh.h +++ b/include/igl/random_points_on_mesh.h @@ -41,7 +41,7 @@ namespace igl Eigen::PlainObjectBase & FI); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "random_points_on_mesh.cpp" #endif diff --git a/include/igl/randperm.cpp b/include/igl/randperm.cpp index 0ba963b04..41c644837 100644 --- a/include/igl/randperm.cpp +++ b/include/igl/randperm.cpp @@ -28,7 +28,7 @@ IGL_INLINE Eigen::PlainObjectBase igl::randperm( const int n) return I; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::randperm >(int, Eigen::PlainObjectBase >&); template Eigen::PlainObjectBase > igl::randperm >(int); diff --git a/include/igl/randperm.h b/include/igl/randperm.h index ccf573d89..bc3244e0f 100644 --- a/include/igl/randperm.h +++ b/include/igl/randperm.h @@ -24,7 +24,7 @@ namespace igl template IGL_INLINE Eigen::PlainObjectBase randperm( const int n); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "randperm.cpp" #endif #endif diff --git a/include/igl/ray_sphere_intersect.cpp b/include/igl/ray_sphere_intersect.cpp index f95d89f4b..60b4b4749 100644 --- a/include/igl/ray_sphere_intersect.cpp +++ b/include/igl/ray_sphere_intersect.cpp @@ -68,7 +68,7 @@ IGL_INLINE int igl::ray_sphere_intersect( return 2; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template int igl::ray_sphere_intersect, Eigen::Matrix, Eigen::Matrix, double, double>(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, double, double&, double&); #endif diff --git a/include/igl/ray_sphere_intersect.h b/include/igl/ray_sphere_intersect.h index 2591408e1..b4dfea379 100644 --- a/include/igl/ray_sphere_intersect.h +++ b/include/igl/ray_sphere_intersect.h @@ -39,7 +39,7 @@ namespace igl t_type & t0, t_type & t1); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "ray_sphere_intersect.cpp" #endif #endif diff --git a/include/igl/readCSV.cpp b/include/igl/readCSV.cpp index 18f4cdd81..a8f57fa34 100644 --- a/include/igl/readCSV.cpp +++ b/include/igl/readCSV.cpp @@ -63,7 +63,7 @@ IGL_INLINE bool igl::readCSV( return false; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh #endif diff --git a/include/igl/readCSV.h b/include/igl/readCSV.h index 51ec68365..480aad129 100644 --- a/include/igl/readCSV.h +++ b/include/igl/readCSV.h @@ -28,7 +28,7 @@ namespace igl Eigen::Matrix& M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readCSV.cpp" #endif diff --git a/include/igl/readDMAT.cpp b/include/igl/readDMAT.cpp index f00d6f27e..a73ff1812 100644 --- a/include/igl/readDMAT.cpp +++ b/include/igl/readDMAT.cpp @@ -197,7 +197,7 @@ IGL_INLINE bool igl::readDMAT( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::readDMAT >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&); template bool igl::readDMAT(std::basic_string, std::allocator >, std::vector >, std::allocator > > >&); diff --git a/include/igl/readDMAT.h b/include/igl/readDMAT.h index c83b0a37c..e09c492c1 100644 --- a/include/igl/readDMAT.h +++ b/include/igl/readDMAT.h @@ -46,7 +46,7 @@ namespace igl std::vector > & W); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readDMAT.cpp" #endif diff --git a/include/igl/readMESH.cpp b/include/igl/readMESH.cpp index 36ce4461a..299c91606 100644 --- a/include/igl/readMESH.cpp +++ b/include/igl/readMESH.cpp @@ -464,7 +464,7 @@ IGL_INLINE bool igl::readMESH( // return true; //} -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::readMESH, Eigen::Matrix, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/readMESH.h b/include/igl/readMESH.h index dad343dcd..fa363d255 100644 --- a/include/igl/readMESH.h +++ b/include/igl/readMESH.h @@ -50,7 +50,7 @@ namespace igl Eigen::PlainObjectBase& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readMESH.cpp" #endif diff --git a/include/igl/readNODE.cpp b/include/igl/readNODE.cpp index 525010884..a073c0c95 100644 --- a/include/igl/readNODE.cpp +++ b/include/igl/readNODE.cpp @@ -156,7 +156,7 @@ IGL_INLINE bool igl::readNODE( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::readNODE, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/readNODE.h b/include/igl/readNODE.h index 5360bb6ff..a4bdb4774 100644 --- a/include/igl/readNODE.h +++ b/include/igl/readNODE.h @@ -43,7 +43,7 @@ namespace igl Eigen::PlainObjectBase& I); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readNODE.cpp" #endif diff --git a/include/igl/readOBJ.cpp b/include/igl/readOBJ.cpp index cc548485c..25493430d 100644 --- a/include/igl/readOBJ.cpp +++ b/include/igl/readOBJ.cpp @@ -381,7 +381,7 @@ IGL_INLINE bool igl::readOBJ( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::readOBJ, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/readOBJ.h b/include/igl/readOBJ.h index 41765d7e1..dca08fc25 100644 --- a/include/igl/readOBJ.h +++ b/include/igl/readOBJ.h @@ -122,7 +122,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readOBJ.cpp" #endif diff --git a/include/igl/readOFF.cpp b/include/igl/readOFF.cpp index 70b8023ec..a02b9dc24 100644 --- a/include/igl/readOFF.cpp +++ b/include/igl/readOFF.cpp @@ -207,7 +207,7 @@ IGL_INLINE bool igl::readOFF( #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::readOFF, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/readOFF.h b/include/igl/readOFF.h index 26371edd0..7392f6df8 100644 --- a/include/igl/readOFF.h +++ b/include/igl/readOFF.h @@ -68,7 +68,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readOFF.cpp" #endif diff --git a/include/igl/readSTL.cpp b/include/igl/readSTL.cpp index c4fb9c477..29e1994ad 100644 --- a/include/igl/readSTL.cpp +++ b/include/igl/readSTL.cpp @@ -213,7 +213,7 @@ close_true: return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template bool igl::readSTL, Eigen::Matrix, Eigen::Matrix >(std::basic_string, std::allocator > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/readSTL.h b/include/igl/readSTL.h index f9cf97676..101716d69 100644 --- a/include/igl/readSTL.h +++ b/include/igl/readSTL.h @@ -49,7 +49,7 @@ namespace igl std::vector > & N); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readSTL.cpp" #endif diff --git a/include/igl/readTGF.h b/include/igl/readTGF.h index 4416be077..8111b519c 100644 --- a/include/igl/readTGF.h +++ b/include/igl/readTGF.h @@ -59,7 +59,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readTGF.cpp" #endif diff --git a/include/igl/readWRL.cpp b/include/igl/readWRL.cpp index d028eebcd..f16f0d1df 100644 --- a/include/igl/readWRL.cpp +++ b/include/igl/readWRL.cpp @@ -103,7 +103,7 @@ IGL_INLINE bool igl::readWRL( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template bool igl::readWRL(std::basic_string, std::allocator >, std::vector >, std::allocator > > >&, std::vector >, std::allocator > > >&); #endif diff --git a/include/igl/readWRL.h b/include/igl/readWRL.h index b2c0177ab..8f2e8d677 100644 --- a/include/igl/readWRL.h +++ b/include/igl/readWRL.h @@ -35,7 +35,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "readWRL.cpp" #endif diff --git a/include/igl/read_triangle_mesh.cpp b/include/igl/read_triangle_mesh.cpp index fb5935716..e3d2bee39 100644 --- a/include/igl/read_triangle_mesh.cpp +++ b/include/igl/read_triangle_mesh.cpp @@ -71,7 +71,7 @@ IGL_INLINE bool igl::read_triangle_mesh( } #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::read_triangle_mesh, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/read_triangle_mesh.h b/include/igl/read_triangle_mesh.h index aee25dffc..89af64afe 100644 --- a/include/igl/read_triangle_mesh.h +++ b/include/igl/read_triangle_mesh.h @@ -45,7 +45,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "read_triangle_mesh.cpp" #endif diff --git a/include/igl/removeDuplicates.cpp b/include/igl/removeDuplicates.cpp index b101d93ca..352b99922 100644 --- a/include/igl/removeDuplicates.cpp +++ b/include/igl/removeDuplicates.cpp @@ -81,7 +81,7 @@ IGL_INLINE void igl::removeDuplicates( delete [] VISITED; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::removeDuplicates, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::Matrix::Scalar, -1, 1, 0, -1, 1>&, double); #endif diff --git a/include/igl/removeDuplicates.h b/include/igl/removeDuplicates.h index bc4521389..c2d438033 100644 --- a/include/igl/removeDuplicates.h +++ b/include/igl/removeDuplicates.h @@ -42,7 +42,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "removeDuplicates.cpp" #endif diff --git a/include/igl/removeUnreferenced.cpp b/include/igl/removeUnreferenced.cpp index 868623c1d..820274c5f 100644 --- a/include/igl/removeUnreferenced.cpp +++ b/include/igl/removeUnreferenced.cpp @@ -63,6 +63,6 @@ IGL_INLINE void igl::removeUnreferenced( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/removeUnreferenced.h b/include/igl/removeUnreferenced.h index 5d316418b..ad31a3cbe 100644 --- a/include/igl/removeUnreferenced.h +++ b/include/igl/removeUnreferenced.h @@ -36,7 +36,7 @@ namespace igl Eigen::PlainObjectBase &I); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "removeUnreferenced.cpp" #endif diff --git a/include/igl/remove_duplicate_vertices.cpp b/include/igl/remove_duplicate_vertices.cpp index 45c8e0328..b39ec64e6 100644 --- a/include/igl/remove_duplicate_vertices.cpp +++ b/include/igl/remove_duplicate_vertices.cpp @@ -75,7 +75,7 @@ IGL_INLINE void igl::remove_duplicate_vertices( // #endif } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::remove_duplicate_vertices, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, double, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/remove_duplicate_vertices.h b/include/igl/remove_duplicate_vertices.h index 33d7564bb..beeb84511 100644 --- a/include/igl/remove_duplicate_vertices.h +++ b/include/igl/remove_duplicate_vertices.h @@ -58,7 +58,7 @@ namespace igl Eigen::PlainObjectBase& SF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "remove_duplicate_vertices.cpp" #endif diff --git a/include/igl/render_to_tga.h b/include/igl/render_to_tga.h index 1701083d7..7746c7453 100644 --- a/include/igl/render_to_tga.h +++ b/include/igl/render_to_tga.h @@ -28,7 +28,7 @@ namespace igl const bool alpha); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "render_to_tga.cpp" #endif diff --git a/include/igl/reorder.cpp b/include/igl/reorder.cpp index fc72faa04..e9d4cc052 100644 --- a/include/igl/reorder.cpp +++ b/include/igl/reorder.cpp @@ -28,7 +28,7 @@ IGL_INLINE void igl::reorder( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::reorder(std::vector > const&, std::vector > const&, std::vector >&); diff --git a/include/igl/reorder.h b/include/igl/reorder.h index 399fef2ed..50f7d7b0f 100644 --- a/include/igl/reorder.h +++ b/include/igl/reorder.h @@ -27,7 +27,7 @@ namespace igl std::vector & ordered); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "reorder.cpp" #endif diff --git a/include/igl/repdiag.cpp b/include/igl/repdiag.cpp index 4eaaaa526..033fb65cc 100644 --- a/include/igl/repdiag.cpp +++ b/include/igl/repdiag.cpp @@ -66,7 +66,7 @@ IGL_INLINE Mat igl::repdiag(const Mat & A, const int d) return B; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::repdiag(Eigen::SparseMatrix const&, int, Eigen::SparseMatrix&); diff --git a/include/igl/repdiag.h b/include/igl/repdiag.h index a19213137..779443374 100644 --- a/include/igl/repdiag.h +++ b/include/igl/repdiag.h @@ -47,7 +47,7 @@ namespace igl IGL_INLINE Mat repdiag(const Mat & A, const int d); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "repdiag.cpp" #endif diff --git a/include/igl/repmat.cpp b/include/igl/repmat.cpp index 6649dabc1..0e5557768 100644 --- a/include/igl/repmat.cpp +++ b/include/igl/repmat.cpp @@ -58,7 +58,7 @@ IGL_INLINE void igl::repmat( B.finalize(); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::repmat, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, int, Eigen::PlainObjectBase >&); diff --git a/include/igl/repmat.h b/include/igl/repmat.h index 3d14b7889..91de78e85 100644 --- a/include/igl/repmat.h +++ b/include/igl/repmat.h @@ -46,7 +46,7 @@ namespace igl Eigen::SparseMatrix & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "repmat.cpp" #endif diff --git a/include/igl/report_gl_error.h b/include/igl/report_gl_error.h index 82db8f37d..136f21105 100644 --- a/include/igl/report_gl_error.h +++ b/include/igl/report_gl_error.h @@ -25,7 +25,7 @@ namespace igl IGL_INLINE GLenum report_gl_error(); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "report_gl_error.cpp" #endif diff --git a/include/igl/rgb_to_hsv.cpp b/include/igl/rgb_to_hsv.cpp index 2421e52ac..7726adcb4 100644 --- a/include/igl/rgb_to_hsv.cpp +++ b/include/igl/rgb_to_hsv.cpp @@ -70,7 +70,7 @@ IGL_INLINE void igl::rgb_to_hsv(const R * rgb, H * hsv) } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::rgb_to_hsv(float const*, double*); template void igl::rgb_to_hsv(double const*, double*); diff --git a/include/igl/rgb_to_hsv.h b/include/igl/rgb_to_hsv.h index b20f1e24c..78133d4ef 100644 --- a/include/igl/rgb_to_hsv.h +++ b/include/igl/rgb_to_hsv.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE void rgb_to_hsv(const R * rgb, H * hsv); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "rgb_to_hsv.cpp" #endif diff --git a/include/igl/right_axis.h b/include/igl/right_axis.h index b2fed9d55..da77a53af 100644 --- a/include/igl/right_axis.h +++ b/include/igl/right_axis.h @@ -25,7 +25,7 @@ namespace igl IGL_INLINE void right_axis(const double * mv, double * x, double * y, double * z); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "right_axis.cpp" #endif #endif diff --git a/include/igl/rotate_by_quat.cpp b/include/igl/rotate_by_quat.cpp index 8a97cc622..5ffd5b21c 100644 --- a/include/igl/rotate_by_quat.cpp +++ b/include/igl/rotate_by_quat.cpp @@ -46,7 +46,7 @@ IGL_INLINE void igl::rotate_by_quat( igl::quat_mult(q_mult_quat_v,q_conj,out); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::rotate_by_quat(double const*, double const*, double*); diff --git a/include/igl/rotate_by_quat.h b/include/igl/rotate_by_quat.h index 94b3cf183..b45204839 100644 --- a/include/igl/rotate_by_quat.h +++ b/include/igl/rotate_by_quat.h @@ -26,7 +26,7 @@ namespace igl Q_type *out); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "rotate_by_quat.cpp" #endif diff --git a/include/igl/rotate_vectors.cpp b/include/igl/rotate_vectors.cpp index 8f8c09fb2..5809dd862 100644 --- a/include/igl/rotate_vectors.cpp +++ b/include/igl/rotate_vectors.cpp @@ -30,6 +30,6 @@ IGL_INLINE Eigen::MatrixXd igl::rotate_vectors( return RV; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/rotate_vectors.h b/include/igl/rotate_vectors.h index 1c69ae1b9..a1b64bcca 100644 --- a/include/igl/rotate_vectors.h +++ b/include/igl/rotate_vectors.h @@ -33,7 +33,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "rotate_vectors.cpp" #endif diff --git a/include/igl/rotation_matrix_from_directions.cpp b/include/igl/rotation_matrix_from_directions.cpp index 7f77a5e79..0bf1e4b4e 100644 --- a/include/igl/rotation_matrix_from_directions.cpp +++ b/include/igl/rotation_matrix_from_directions.cpp @@ -54,7 +54,7 @@ IGL_INLINE Eigen::Matrix igl::rotation_matrix_from_directions(Eige return rotM; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/rotation_matrix_from_directions.h b/include/igl/rotation_matrix_from_directions.h index 746147875..aa63ab23e 100644 --- a/include/igl/rotation_matrix_from_directions.h +++ b/include/igl/rotation_matrix_from_directions.h @@ -28,7 +28,7 @@ namespace igl { } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "rotation_matrix_from_directions.cpp" #endif diff --git a/include/igl/round.cpp b/include/igl/round.cpp index 3cd280c9e..44de48d39 100644 --- a/include/igl/round.cpp +++ b/include/igl/round.cpp @@ -33,7 +33,7 @@ IGL_INLINE void igl::round( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template void igl::round, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template void igl::round, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/round.h b/include/igl/round.h index a2e3ed166..cdaac731b 100644 --- a/include/igl/round.h +++ b/include/igl/round.h @@ -30,7 +30,7 @@ namespace igl Eigen::PlainObjectBase& Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "round.cpp" #endif diff --git a/include/igl/rows_to_matrix.cpp b/include/igl/rows_to_matrix.cpp index d297f4de3..9a0d52335 100644 --- a/include/igl/rows_to_matrix.cpp +++ b/include/igl/rows_to_matrix.cpp @@ -49,6 +49,6 @@ IGL_INLINE bool igl::rows_to_matrix(const std::vector & V,Mat & M) return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/rows_to_matrix.h b/include/igl/rows_to_matrix.h index 50d170e47..8f62b5a2d 100644 --- a/include/igl/rows_to_matrix.h +++ b/include/igl/rows_to_matrix.h @@ -27,7 +27,7 @@ namespace igl IGL_INLINE bool rows_to_matrix(const std::vector & V,Mat & M); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "rows_to_matrix.cpp" #endif diff --git a/include/igl/sample_edges.h b/include/igl/sample_edges.h index 03bc160f9..96822736f 100644 --- a/include/igl/sample_edges.h +++ b/include/igl/sample_edges.h @@ -30,7 +30,7 @@ namespace igl const int k, Eigen::MatrixXd & S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sample_edges.cpp" #endif diff --git a/include/igl/setdiff.cpp b/include/igl/setdiff.cpp index b4c3ed8c8..c702599b0 100644 --- a/include/igl/setdiff.cpp +++ b/include/igl/setdiff.cpp @@ -77,7 +77,7 @@ IGL_INLINE void igl::setdiff( list_to_matrix(vIA,IA); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::setdiff, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/setdiff.h b/include/igl/setdiff.h index f95d18a4e..b22cfcd42 100644 --- a/include/igl/setdiff.h +++ b/include/igl/setdiff.h @@ -32,7 +32,7 @@ namespace igl Eigen::PlainObjectBase & IA); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "setdiff.cpp" #endif #endif diff --git a/include/igl/slice.cpp b/include/igl/slice.cpp index d4fe5c229..1c3dc426e 100644 --- a/include/igl/slice.cpp +++ b/include/igl/slice.cpp @@ -183,7 +183,7 @@ IGL_INLINE Eigen::PlainObjectBase igl::slice( return Y; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::slice >(Eigen::PlainObjectBase > const&, Eigen::Matrix const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/slice.h b/include/igl/slice.h index 093dae8f0..a4a6f57e2 100644 --- a/include/igl/slice.h +++ b/include/igl/slice.h @@ -65,7 +65,7 @@ namespace igl const int dim); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "slice.cpp" #endif diff --git a/include/igl/slice_into.cpp b/include/igl/slice_into.cpp index b80878fb7..f2b55e1d2 100644 --- a/include/igl/slice_into.cpp +++ b/include/igl/slice_into.cpp @@ -127,7 +127,7 @@ IGL_INLINE void igl::slice_into( return igl::slice_into(X,R,C,Y); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::slice_into >(Eigen::PlainObjectBase > const&, Eigen::Matrix const&, Eigen::Matrix const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/slice_into.h b/include/igl/slice_into.h index e534c0fad..7be7a2920 100644 --- a/include/igl/slice_into.h +++ b/include/igl/slice_into.h @@ -56,7 +56,7 @@ namespace igl Eigen::PlainObjectBase & Y); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "slice_into.cpp" #endif diff --git a/include/igl/snap_points.cpp b/include/igl/snap_points.cpp index ea8adf046..2072ca836 100644 --- a/include/igl/snap_points.cpp +++ b/include/igl/snap_points.cpp @@ -67,7 +67,7 @@ IGL_INLINE void igl::snap_points( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::snap_points, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/snap_points.h b/include/igl/snap_points.h index 82d862c08..432f286a4 100644 --- a/include/igl/snap_points.h +++ b/include/igl/snap_points.h @@ -48,7 +48,7 @@ namespace igl Eigen::PlainObjectBase & minD); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "snap_points.cpp" #endif diff --git a/include/igl/snap_to_canonical_view_quat.cpp b/include/igl/snap_to_canonical_view_quat.cpp index 49bb4f92d..b7518ff98 100644 --- a/include/igl/snap_to_canonical_view_quat.cpp +++ b/include/igl/snap_to_canonical_view_quat.cpp @@ -105,7 +105,7 @@ IGL_INLINE bool igl::snap_to_canonical_view_quat( q.coeffs().data(),threshold,s.coeffs().data()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::snap_to_canonical_view_quat(double const*, double, double*); diff --git a/include/igl/snap_to_canonical_view_quat.h b/include/igl/snap_to_canonical_view_quat.h index 239c99fcb..14ab81b4f 100644 --- a/include/igl/snap_to_canonical_view_quat.h +++ b/include/igl/snap_to_canonical_view_quat.h @@ -35,7 +35,7 @@ template Eigen::Quaterniond & s); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "snap_to_canonical_view_quat.cpp" #endif diff --git a/include/igl/snap_to_fixed_up.h b/include/igl/snap_to_fixed_up.h index aa0193744..d7bc3b6ed 100644 --- a/include/igl/snap_to_fixed_up.h +++ b/include/igl/snap_to_fixed_up.h @@ -29,7 +29,7 @@ namespace igl Eigen::Quaterniond & s); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "snap_to_fixed_up.cpp" #endif diff --git a/include/igl/sort.cpp b/include/igl/sort.cpp index aa9382aa3..c2273219e 100644 --- a/include/igl/sort.cpp +++ b/include/igl/sort.cpp @@ -210,7 +210,7 @@ IGL_INLINE void igl::sort( igl::reorder(unsorted,index_map,sorted); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::sort, Eigen::Matrix >(Eigen::PlainObjectBase > const&, int, bool, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/sort.h b/include/igl/sort.h index 52eabee28..72b49f33b 100644 --- a/include/igl/sort.h +++ b/include/igl/sort.h @@ -72,7 +72,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sort.cpp" #endif diff --git a/include/igl/sort_triangles.cpp b/include/igl/sort_triangles.cpp index 83d5001e1..2da67882b 100644 --- a/include/igl/sort_triangles.cpp +++ b/include/igl/sort_triangles.cpp @@ -563,7 +563,7 @@ class Triangle //} #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation //template void igl::sort_triangles_robust, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #ifndef IGL_NO_OPENGL diff --git a/include/igl/sort_triangles.h b/include/igl/sort_triangles.h index 8840ed8f4..5cee41b33 100644 --- a/include/igl/sort_triangles.h +++ b/include/igl/sort_triangles.h @@ -83,7 +83,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sort_triangles.cpp" #endif diff --git a/include/igl/sortrows.cpp b/include/igl/sortrows.cpp index c8167903b..86296f22a 100644 --- a/include/igl/sortrows.cpp +++ b/include/igl/sortrows.cpp @@ -80,7 +80,7 @@ IGL_INLINE void igl::sortrows( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template void igl::sortrows, Eigen::Matrix >(Eigen::PlainObjectBase > const&, bool, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); template void igl::sortrows, Eigen::Matrix >(Eigen::PlainObjectBase > const&, bool, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); template void igl::sortrows, Eigen::Matrix >(Eigen::PlainObjectBase > const&, bool, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/sortrows.h b/include/igl/sortrows.h index 1e6d2ac38..f18683b3e 100644 --- a/include/igl/sortrows.h +++ b/include/igl/sortrows.h @@ -33,7 +33,7 @@ namespace igl Eigen::PlainObjectBase& IX); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sortrows.cpp" #endif diff --git a/include/igl/sparse.cpp b/include/igl/sparse.cpp index 5b4cdbb3c..3b34bc2e5 100644 --- a/include/igl/sparse.cpp +++ b/include/igl/sparse.cpp @@ -103,7 +103,7 @@ IGL_INLINE Eigen::SparseMatrix igl::sparse( return X; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::sparse, Eigen::Matrix, double>(Eigen::Matrix const&, Eigen::Matrix const&, Eigen::Matrix const&, size_t, size_t, Eigen::SparseMatrix&); template void igl::sparse, double>(Eigen::PlainObjectBase > const&, Eigen::SparseMatrix&); diff --git a/include/igl/sparse.h b/include/igl/sparse.h index ee619d25b..fa6dae4b3 100644 --- a/include/igl/sparse.h +++ b/include/igl/sparse.h @@ -67,7 +67,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sparse.cpp" #endif diff --git a/include/igl/speye.cpp b/include/igl/speye.cpp index c878168d0..76c96c5b2 100644 --- a/include/igl/speye.cpp +++ b/include/igl/speye.cpp @@ -27,7 +27,7 @@ IGL_INLINE void igl::speye(const int n, Eigen::SparseMatrix & I) return igl::speye(n,n,I); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::speye(int, Eigen::SparseMatrix&); diff --git a/include/igl/speye.h b/include/igl/speye.h index f4532a399..4c2425571 100644 --- a/include/igl/speye.h +++ b/include/igl/speye.h @@ -35,7 +35,7 @@ namespace igl IGL_INLINE void speye(const int n, Eigen::SparseMatrix & I); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "speye.cpp" #endif diff --git a/include/igl/stdin_to_temp.h b/include/igl/stdin_to_temp.h index 88d8c2a12..ae35219ea 100644 --- a/include/igl/stdin_to_temp.h +++ b/include/igl/stdin_to_temp.h @@ -29,7 +29,7 @@ namespace igl IGL_INLINE bool stdin_to_temp(FILE ** temp_file); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "stdin_to_temp.cpp" #endif diff --git a/include/igl/sum.cpp b/include/igl/sum.cpp index 10f6cb6eb..5983657ec 100644 --- a/include/igl/sum.cpp +++ b/include/igl/sum.cpp @@ -45,6 +45,6 @@ IGL_INLINE void igl::sum( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif diff --git a/include/igl/sum.h b/include/igl/sum.h index 3f74196ee..4ef04994f 100644 --- a/include/igl/sum.h +++ b/include/igl/sum.h @@ -35,7 +35,7 @@ namespace igl Eigen::SparseVector& S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "sum.cpp" #endif diff --git a/include/igl/svd3x3/arap.cpp b/include/igl/svd3x3/arap.cpp index c6649db00..cc9773bf2 100644 --- a/include/igl/svd3x3/arap.cpp +++ b/include/igl/svd3x3/arap.cpp @@ -302,7 +302,7 @@ IGL_INLINE bool igl::arap_solve( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template bool igl::arap_solve, Eigen::Matrix >(Eigen::PlainObjectBase > const&, igl::ARAPData&, Eigen::PlainObjectBase >&); template bool igl::arap_precomputation, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase > const&, igl::ARAPData&); #endif diff --git a/include/igl/svd3x3/arap.h b/include/igl/svd3x3/arap.h index 6b016af7b..92070e0c9 100644 --- a/include/igl/svd3x3/arap.h +++ b/include/igl/svd3x3/arap.h @@ -94,7 +94,7 @@ namespace igl Eigen::PlainObjectBase & U); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY #include "arap.cpp" #endif diff --git a/include/igl/svd3x3/arap_dof.cpp b/include/igl/svd3x3/arap_dof.cpp index 589b3955d..8d59bfceb 100644 --- a/include/igl/svd3x3/arap_dof.cpp +++ b/include/igl/svd3x3/arap_dof.cpp @@ -875,7 +875,7 @@ IGL_INLINE bool igl::arap_dof_update( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit instanciation template bool igl::arap_dof_update, double>(ArapDOFData, double> const&, Eigen::Matrix const&, Eigen::Matrix const&, int, double, Eigen::Matrix&); template bool igl::arap_dof_recomputation, double>(Eigen::Matrix const&, Eigen::SparseMatrix const&, ArapDOFData, double>&); diff --git a/include/igl/svd3x3/arap_dof.h b/include/igl/svd3x3/arap_dof.h index 05a72fdb3..c9ff16574 100644 --- a/include/igl/svd3x3/arap_dof.h +++ b/include/igl/svd3x3/arap_dof.h @@ -237,7 +237,7 @@ namespace igl }; } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "arap_dof.cpp" #endif diff --git a/include/igl/svd3x3/fit_rotations.cpp b/include/igl/svd3x3/fit_rotations.cpp index c12e7a541..cb6fe647d 100644 --- a/include/igl/svd3x3/fit_rotations.cpp +++ b/include/igl/svd3x3/fit_rotations.cpp @@ -216,7 +216,7 @@ IGL_INLINE void igl::fit_rotations_AVX( } #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::fit_rotations, Eigen::Matrix >(Eigen::PlainObjectBase > const&, bool, Eigen::PlainObjectBase >&); template void igl::fit_rotations_planar, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/svd3x3/fit_rotations.h b/include/igl/svd3x3/fit_rotations.h index 5968a1338..1a8a626d3 100644 --- a/include/igl/svd3x3/fit_rotations.h +++ b/include/igl/svd3x3/fit_rotations.h @@ -50,7 +50,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "fit_rotations.cpp" #endif diff --git a/include/igl/svd3x3/polar_svd3x3.cpp b/include/igl/svd3x3/polar_svd3x3.cpp index 09847b2c5..237e09047 100644 --- a/include/igl/svd3x3/polar_svd3x3.cpp +++ b/include/igl/svd3x3/polar_svd3x3.cpp @@ -97,7 +97,7 @@ IGL_INLINE void igl::polar_svd3x3_avx(const Eigen::Matrix& A, Eigen:: } #endif -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::polar_svd3x3 >(Eigen::Matrix const&, Eigen::Matrix&); diff --git a/include/igl/svd3x3/polar_svd3x3.h b/include/igl/svd3x3/polar_svd3x3.h index 64b2362dd..b4f103674 100644 --- a/include/igl/svd3x3/polar_svd3x3.h +++ b/include/igl/svd3x3/polar_svd3x3.h @@ -36,7 +36,7 @@ namespace igl IGL_INLINE void polar_svd3x3_avx(const Eigen::Matrix& A, Eigen::Matrix &R); #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "polar_svd3x3.cpp" #endif #endif diff --git a/include/igl/svd3x3/svd3x3.h b/include/igl/svd3x3/svd3x3.h index 9a23ee9ee..180f29a4c 100644 --- a/include/igl/svd3x3/svd3x3.h +++ b/include/igl/svd3x3/svd3x3.h @@ -34,7 +34,7 @@ namespace igl Eigen::Matrix &S, Eigen::Matrix&V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "svd3x3.cpp" #endif #endif diff --git a/include/igl/svd3x3/svd3x3_avx.h b/include/igl/svd3x3/svd3x3_avx.h index b303c6f15..24742d2d6 100644 --- a/include/igl/svd3x3/svd3x3_avx.h +++ b/include/igl/svd3x3/svd3x3_avx.h @@ -33,7 +33,7 @@ namespace igl Eigen::Matrix &S, Eigen::Matrix&V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "svd3x3_avx.cpp" #endif #endif diff --git a/include/igl/svd3x3/svd3x3_sse.h b/include/igl/svd3x3/svd3x3_sse.h index ebd9c6253..3322fd353 100644 --- a/include/igl/svd3x3/svd3x3_sse.h +++ b/include/igl/svd3x3/svd3x3_sse.h @@ -31,7 +31,7 @@ namespace igl Eigen::Matrix &S, Eigen::Matrix&V); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "svd3x3_sse.cpp" #endif #endif diff --git a/include/igl/tetgen/mesh_to_tetgenio.cpp b/include/igl/tetgen/mesh_to_tetgenio.cpp index 6d9833610..541127e3b 100644 --- a/include/igl/tetgen/mesh_to_tetgenio.cpp +++ b/include/igl/tetgen/mesh_to_tetgenio.cpp @@ -72,7 +72,7 @@ IGL_INLINE bool igl::mesh_to_tetgenio( return mesh_to_tetgenio(vV,vF,in); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::mesh_to_tetgenio, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, tetgenio&); #endif diff --git a/include/igl/tetgen/mesh_to_tetgenio.h b/include/igl/tetgen/mesh_to_tetgenio.h index e577f112d..11d5d24c3 100644 --- a/include/igl/tetgen/mesh_to_tetgenio.h +++ b/include/igl/tetgen/mesh_to_tetgenio.h @@ -40,7 +40,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mesh_to_tetgenio.cpp" #endif diff --git a/include/igl/tetgen/mesh_with_skeleton.cpp b/include/igl/tetgen/mesh_with_skeleton.cpp index 12f7e8e2f..31a84e97e 100644 --- a/include/igl/tetgen/mesh_with_skeleton.cpp +++ b/include/igl/tetgen/mesh_with_skeleton.cpp @@ -102,6 +102,6 @@ IGL_INLINE bool igl::mesh_with_skeleton( V,F,C,P,BE,CE,samples_per_bone,DEFAULT_TETGEN_FLAGS,VV,TT,FF); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation #endif diff --git a/include/igl/tetgen/mesh_with_skeleton.h b/include/igl/tetgen/mesh_with_skeleton.h index f2e9ec9ce..0a85b8383 100644 --- a/include/igl/tetgen/mesh_with_skeleton.h +++ b/include/igl/tetgen/mesh_with_skeleton.h @@ -59,7 +59,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "mesh_with_skeleton.cpp" #endif diff --git a/include/igl/tetgen/read_into_tetgenio.h b/include/igl/tetgen/read_into_tetgenio.h index c1c82f027..461f9c9ec 100644 --- a/include/igl/tetgen/read_into_tetgenio.h +++ b/include/igl/tetgen/read_into_tetgenio.h @@ -45,7 +45,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "read_into_tetgenio.cpp" #endif diff --git a/include/igl/tetgen/tetgenio_to_tetmesh.cpp b/include/igl/tetgen/tetgenio_to_tetmesh.cpp index 0b324e214..755fb13bc 100644 --- a/include/igl/tetgen/tetgenio_to_tetmesh.cpp +++ b/include/igl/tetgen/tetgenio_to_tetmesh.cpp @@ -95,7 +95,7 @@ IGL_INLINE bool igl::tetgenio_to_tetmesh( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template bool igl::tetgenio_to_tetmesh, Eigen::Matrix >(tetgenio const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/tetgen/tetgenio_to_tetmesh.h b/include/igl/tetgen/tetgenio_to_tetmesh.h index 31981d333..dbc3201b3 100644 --- a/include/igl/tetgen/tetgenio_to_tetmesh.h +++ b/include/igl/tetgen/tetgenio_to_tetmesh.h @@ -39,7 +39,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "tetgenio_to_tetmesh.cpp" #endif diff --git a/include/igl/tetgen/tetrahedralize.cpp b/include/igl/tetgen/tetrahedralize.cpp index c2d4e6944..b7cdbe2d7 100644 --- a/include/igl/tetgen/tetrahedralize.cpp +++ b/include/igl/tetgen/tetrahedralize.cpp @@ -101,7 +101,7 @@ IGL_INLINE int igl::tetrahedralize( return e; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template int igl::tetrahedralize, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, std::basic_string, std::allocator >, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/tetgen/tetrahedralize.h b/include/igl/tetgen/tetrahedralize.h index 9df4302b2..26be97ad9 100644 --- a/include/igl/tetgen/tetrahedralize.h +++ b/include/igl/tetgen/tetrahedralize.h @@ -64,7 +64,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "tetrahedralize.cpp" #endif diff --git a/include/igl/texture_from_tga.h b/include/igl/texture_from_tga.h index 0f4c1c34f..78f1cc123 100644 --- a/include/igl/texture_from_tga.h +++ b/include/igl/texture_from_tga.h @@ -26,7 +26,7 @@ namespace igl IGL_INLINE bool texture_from_tga(const std::string tga_file, GLuint & id); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "texture_from_tga.cpp" #endif diff --git a/include/igl/tga.h b/include/igl/tga.h index 405047336..1a5e5e2bb 100644 --- a/include/igl/tga.h +++ b/include/igl/tga.h @@ -93,7 +93,7 @@ IGL_INLINE void writeTGA( gliGenericImage* image, FILE *fp); } // end of igl namespace -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "tga.cpp" #endif diff --git a/include/igl/trackball.cpp b/include/igl/trackball.cpp index befe5b3a2..5053ec88e 100644 --- a/include/igl/trackball.cpp +++ b/include/igl/trackball.cpp @@ -155,7 +155,7 @@ IGL_INLINE void igl::trackball( quat.coeffs().data()); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::trackball(double, double, double, double const*, double, double, double, double, double*); diff --git a/include/igl/trackball.h b/include/igl/trackball.h index 6c0613a59..83cc61ed4 100644 --- a/include/igl/trackball.h +++ b/include/igl/trackball.h @@ -72,7 +72,7 @@ namespace igl Eigen::Quaterniond & quat); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "trackball.cpp" #endif diff --git a/include/igl/transpose_blocks.cpp b/include/igl/transpose_blocks.cpp index 5d7c5c27e..c90584d06 100644 --- a/include/igl/transpose_blocks.cpp +++ b/include/igl/transpose_blocks.cpp @@ -56,7 +56,7 @@ IGL_INLINE void igl::transpose_blocks( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::transpose_blocks(Eigen::Matrix const&, size_t, size_t, Eigen::Matrix&); diff --git a/include/igl/transpose_blocks.h b/include/igl/transpose_blocks.h index 5e533d0ba..65ce89fbd 100644 --- a/include/igl/transpose_blocks.h +++ b/include/igl/transpose_blocks.h @@ -54,7 +54,7 @@ namespace igl Eigen::Matrix & B); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "transpose_blocks.cpp" #endif diff --git a/include/igl/triangle/triangulate.cpp b/include/igl/triangle/triangulate.cpp index 32340b4d0..90f82483b 100644 --- a/include/igl/triangle/triangulate.cpp +++ b/include/igl/triangle/triangulate.cpp @@ -101,6 +101,6 @@ IGL_INLINE void igl::triangulate( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation #endif diff --git a/include/igl/triangle/triangulate.h b/include/igl/triangle/triangulate.h index 9a8e378db..88c028dca 100644 --- a/include/igl/triangle/triangulate.h +++ b/include/igl/triangle/triangulate.h @@ -35,7 +35,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "triangulate.cpp" #endif diff --git a/include/igl/triangle_fan.h b/include/igl/triangle_fan.h index 758e2188b..d6dcb45e7 100644 --- a/include/igl/triangle_fan.h +++ b/include/igl/triangle_fan.h @@ -17,7 +17,7 @@ namespace igl // In-line version IGL_INLINE Eigen::MatrixXi triangle_fan( const Eigen::MatrixXi & E); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "triangle_fan.h" #endif #endif diff --git a/include/igl/triangle_triangle_adjacency.cpp b/include/igl/triangle_triangle_adjacency.cpp index ca4067aa4..51e0e982d 100644 --- a/include/igl/triangle_triangle_adjacency.cpp +++ b/include/igl/triangle_triangle_adjacency.cpp @@ -98,7 +98,7 @@ IGL_INLINE void igl::triangle_triangle_adjacency(const Eigen::PlainObjectBase, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); // generated by autoexplicit.sh diff --git a/include/igl/triangle_triangle_adjacency.h b/include/igl/triangle_triangle_adjacency.h index a9eb72b96..9778ada51 100644 --- a/include/igl/triangle_triangle_adjacency.h +++ b/include/igl/triangle_triangle_adjacency.h @@ -59,7 +59,7 @@ namespace igl Eigen::PlainObjectBase& TTi); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "triangle_triangle_adjacency.cpp" #endif diff --git a/include/igl/two_axis_valuator_fixed_up.h b/include/igl/two_axis_valuator_fixed_up.h index 95ea66b69..5ff712e62 100644 --- a/include/igl/two_axis_valuator_fixed_up.h +++ b/include/igl/two_axis_valuator_fixed_up.h @@ -42,7 +42,7 @@ namespace igl Eigen::Quaterniond & quat); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "two_axis_valuator_fixed_up.cpp" #endif diff --git a/include/igl/uniform_type_to_string.h b/include/igl/uniform_type_to_string.h index 49a473fda..ff7c12bc7 100644 --- a/include/igl/uniform_type_to_string.h +++ b/include/igl/uniform_type_to_string.h @@ -24,7 +24,7 @@ namespace igl IGL_INLINE std::string uniform_type_to_string(const GLenum type); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "uniform_type_to_string.cpp" #endif diff --git a/include/igl/uniformly_sample_two_manifold.h b/include/igl/uniformly_sample_two_manifold.h index 123f54b74..5ed5e35c5 100644 --- a/include/igl/uniformly_sample_two_manifold.h +++ b/include/igl/uniformly_sample_two_manifold.h @@ -36,7 +36,7 @@ namespace igl const double push, Eigen::VectorXi & S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "uniformly_sample_two_manifold.h" #endif #endif diff --git a/include/igl/unique.cpp b/include/igl/unique.cpp index 1707d2adc..808433933 100644 --- a/include/igl/unique.cpp +++ b/include/igl/unique.cpp @@ -219,7 +219,7 @@ IGL_INLINE void igl::unique_rows( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::unique(std::vector > const&, std::vector >&, std::vector >&, std::vector >&); template void igl::unique_rows, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&, Eigen::PlainObjectBase >&); diff --git a/include/igl/unique.h b/include/igl/unique.h index af327a4d1..3420edfa7 100644 --- a/include/igl/unique.h +++ b/include/igl/unique.h @@ -59,7 +59,7 @@ namespace igl Eigen::PlainObjectBase& IC); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "unique.cpp" #endif diff --git a/include/igl/unique_simplices.h b/include/igl/unique_simplices.h index 44a610e67..818dd4731 100644 --- a/include/igl/unique_simplices.h +++ b/include/igl/unique_simplices.h @@ -22,7 +22,7 @@ namespace igl Eigen::MatrixXi & FF); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "unique_simplices.cpp" #endif diff --git a/include/igl/unproject.cpp b/include/igl/unproject.cpp index 7d2d07dbe..d55f9f4a8 100644 --- a/include/igl/unproject.cpp +++ b/include/igl/unproject.cpp @@ -55,7 +55,7 @@ IGL_INLINE Eigen::PlainObjectBase igl::unproject( } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template int igl::unproject, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template int igl::unproject, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/unproject.h b/include/igl/unproject.h index bec902be8..9aafe5001 100644 --- a/include/igl/unproject.h +++ b/include/igl/unproject.h @@ -34,7 +34,7 @@ namespace igl const Eigen::PlainObjectBase & win); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "unproject.cpp" #endif diff --git a/include/igl/unproject_to_zero_plane.cpp b/include/igl/unproject_to_zero_plane.cpp index a2ad2ff65..fe3cbec8a 100644 --- a/include/igl/unproject_to_zero_plane.cpp +++ b/include/igl/unproject_to_zero_plane.cpp @@ -36,7 +36,7 @@ IGL_INLINE int igl::unproject_to_zero_plane( &obj.data()[2]); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template int igl::unproject_to_zero_plane, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); template int igl::unproject_to_zero_plane, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/unproject_to_zero_plane.h b/include/igl/unproject_to_zero_plane.h index bf2145c90..8b81bdef6 100644 --- a/include/igl/unproject_to_zero_plane.h +++ b/include/igl/unproject_to_zero_plane.h @@ -31,7 +31,7 @@ namespace igl Eigen::PlainObjectBase & obj); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "unproject_to_zero_plane.cpp" #endif diff --git a/include/igl/up_axis.h b/include/igl/up_axis.h index c11b35586..bb0456212 100644 --- a/include/igl/up_axis.h +++ b/include/igl/up_axis.h @@ -25,7 +25,7 @@ IGL_INLINE void up_axis(double * x, double * y, double * z); IGL_INLINE void up_axis(const double * mv, double * x, double * y, double * z); }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "up_axis.cpp" #endif #endif diff --git a/include/igl/upsample.cpp b/include/igl/upsample.cpp index 966f90ffa..ee5f22e87 100644 --- a/include/igl/upsample.cpp +++ b/include/igl/upsample.cpp @@ -103,7 +103,7 @@ IGL_INLINE void igl::upsample( return upsample(V_copy,F_copy,V,F); } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::upsample, Eigen::Matrix >(Eigen::Matrix&, Eigen::Matrix&); #endif diff --git a/include/igl/upsample.h b/include/igl/upsample.h index 522c9f728..20da8579d 100644 --- a/include/igl/upsample.h +++ b/include/igl/upsample.h @@ -49,7 +49,7 @@ namespace igl MatF& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "upsample.cpp" #endif diff --git a/include/igl/vertex_triangle_adjacency.cpp b/include/igl/vertex_triangle_adjacency.cpp index e81289f71..59e67f661 100644 --- a/include/igl/vertex_triangle_adjacency.cpp +++ b/include/igl/vertex_triangle_adjacency.cpp @@ -32,7 +32,7 @@ IGL_INLINE void igl::vertex_triangle_adjacency( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::vertex_triangle_adjacency, Eigen::Matrix, int>(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, std::vector >, std::allocator > > >&, std::vector >, std::allocator > > >&); diff --git a/include/igl/vertex_triangle_adjacency.h b/include/igl/vertex_triangle_adjacency.h index ee1807846..9980da1b8 100644 --- a/include/igl/vertex_triangle_adjacency.h +++ b/include/igl/vertex_triangle_adjacency.h @@ -36,7 +36,7 @@ namespace igl std::vector >& VFi); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "vertex_triangle_adjacency.cpp" #endif diff --git a/include/igl/view_axis.cpp b/include/igl/view_axis.cpp index 7ffcf81a7..a46dce745 100644 --- a/include/igl/view_axis.cpp +++ b/include/igl/view_axis.cpp @@ -34,7 +34,7 @@ IGL_INLINE void igl::view_axis(Eigen::PlainObjectBase & V) V(2) = z; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template instanciation template void igl::view_axis >(Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/view_axis.h b/include/igl/view_axis.h index f92f68141..ab86148df 100644 --- a/include/igl/view_axis.h +++ b/include/igl/view_axis.h @@ -30,7 +30,7 @@ namespace igl }; -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "view_axis.cpp" #endif diff --git a/include/igl/viewer/Viewer.h b/include/igl/viewer/Viewer.h index fcff35a2b..260a21462 100644 --- a/include/igl/viewer/Viewer.h +++ b/include/igl/viewer/Viewer.h @@ -599,7 +599,7 @@ namespace igl } // end namespace -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "Viewer.cpp" #endif diff --git a/include/igl/volume.cpp b/include/igl/volume.cpp index c108b2cc7..fc6288225 100644 --- a/include/igl/volume.cpp +++ b/include/igl/volume.cpp @@ -104,7 +104,7 @@ IGL_INLINE void igl::volume( (192.*u*v*w); } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template void igl::volume, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase >&); diff --git a/include/igl/volume.h b/include/igl/volume.h index 773295baa..fbf1e1e8f 100644 --- a/include/igl/volume.h +++ b/include/igl/volume.h @@ -65,7 +65,7 @@ namespace igl Eigen::PlainObjectBase& vol); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "volume.cpp" #endif diff --git a/include/igl/winding_number.cpp b/include/igl/winding_number.cpp index ae50a4d74..c7ca96512 100644 --- a/include/igl/winding_number.cpp +++ b/include/igl/winding_number.cpp @@ -207,7 +207,7 @@ IGL_INLINE void igl::winding_number_2( } } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization template void igl::winding_number_3(double const*, int, int const*, int, double const*, int, double*); template void igl::winding_number_2(double const*, int, double const*, int, double const*, int, double*); diff --git a/include/igl/winding_number.h b/include/igl/winding_number.h index 73486182e..409bad10e 100644 --- a/include/igl/winding_number.h +++ b/include/igl/winding_number.h @@ -60,7 +60,7 @@ namespace igl double * S); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "winding_number.h" #endif diff --git a/include/igl/writeDMAT.cpp b/include/igl/writeDMAT.cpp index c197657c9..ddbb9666a 100644 --- a/include/igl/writeDMAT.cpp +++ b/include/igl/writeDMAT.cpp @@ -94,7 +94,7 @@ IGL_INLINE bool igl::writeDMAT( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::writeDMAT >(std::basic_string, std::allocator >, Eigen::Matrix const&,bool); diff --git a/include/igl/writeDMAT.h b/include/igl/writeDMAT.h index 10957007f..f481e0699 100644 --- a/include/igl/writeDMAT.h +++ b/include/igl/writeDMAT.h @@ -34,7 +34,7 @@ namespace igl const std::vector > W); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeDMAT.cpp" #endif diff --git a/include/igl/writeMESH.cpp b/include/igl/writeMESH.cpp index 1840ca95f..bcc462d57 100644 --- a/include/igl/writeMESH.cpp +++ b/include/igl/writeMESH.cpp @@ -135,7 +135,7 @@ IGL_INLINE bool igl::writeMESH( return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization //template bool igl::writeMESH, Eigen::Matrix, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&); template bool igl::writeMESH, Eigen::Matrix, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/writeMESH.h b/include/igl/writeMESH.h index 3951e90bf..4bb51418e 100644 --- a/include/igl/writeMESH.h +++ b/include/igl/writeMESH.h @@ -51,7 +51,7 @@ namespace igl const Eigen::PlainObjectBase & F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeMESH.cpp" #endif diff --git a/include/igl/writeOBJ.cpp b/include/igl/writeOBJ.cpp index 2ca56f998..1450a8db7 100644 --- a/include/igl/writeOBJ.cpp +++ b/include/igl/writeOBJ.cpp @@ -114,7 +114,7 @@ IGL_INLINE bool igl::writeOBJ( fclose(obj_file); return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::writeOBJ, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/writeOBJ.h b/include/igl/writeOBJ.h index a5a00ad9e..c2bbb0ba2 100644 --- a/include/igl/writeOBJ.h +++ b/include/igl/writeOBJ.h @@ -40,7 +40,7 @@ namespace igl } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeOBJ.cpp" #endif diff --git a/include/igl/writeOFF.cpp b/include/igl/writeOFF.cpp index 7e6cee4fd..d45d02d17 100644 --- a/include/igl/writeOFF.cpp +++ b/include/igl/writeOFF.cpp @@ -48,7 +48,7 @@ IGL_INLINE bool igl::writeOFF( fclose (fp); return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::writeOFF, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/writeOFF.h b/include/igl/writeOFF.h index 3df9f9760..93cdad57a 100644 --- a/include/igl/writeOFF.h +++ b/include/igl/writeOFF.h @@ -21,7 +21,7 @@ namespace igl const Eigen::PlainObjectBase& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeOFF.cpp" #endif diff --git a/include/igl/writeSTL.h b/include/igl/writeSTL.h index 3988c05a6..1ffd20281 100644 --- a/include/igl/writeSTL.h +++ b/include/igl/writeSTL.h @@ -45,7 +45,7 @@ namespace igl const bool ascii=true); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeSTL.cpp" #endif diff --git a/include/igl/writeTGF.h b/include/igl/writeTGF.h index ff5a4d70c..999584463 100644 --- a/include/igl/writeTGF.h +++ b/include/igl/writeTGF.h @@ -40,7 +40,7 @@ namespace igl #endif } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "writeTGF.cpp" #endif diff --git a/include/igl/write_triangle_mesh.cpp b/include/igl/write_triangle_mesh.cpp index 2a4a9068f..93365095e 100644 --- a/include/igl/write_triangle_mesh.cpp +++ b/include/igl/write_triangle_mesh.cpp @@ -35,7 +35,7 @@ IGL_INLINE bool igl::write_triangle_mesh( return false; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization // generated by autoexplicit.sh template bool igl::write_triangle_mesh, Eigen::Matrix >(std::basic_string, std::allocator >, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&); diff --git a/include/igl/write_triangle_mesh.h b/include/igl/write_triangle_mesh.h index 39c3213c6..3986b36e6 100644 --- a/include/igl/write_triangle_mesh.h +++ b/include/igl/write_triangle_mesh.h @@ -24,7 +24,7 @@ namespace igl const Eigen::PlainObjectBase& F); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "write_triangle_mesh.cpp" #endif diff --git a/scripts/compress.sh b/scripts/compress.sh index 1dd773016..3120f5d40 100755 --- a/scripts/compress.sh +++ b/scripts/compress.sh @@ -69,13 +69,13 @@ Compressed on `date` echo "$HEADER" | sed -e "s/^/\/\/ /" >> $H_OUT WIDGET_OPEN=" -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY # define IGL_HEADER_ONLY # define IGL_HEADER_ONLY_WAS_NOT_DEFINED #endif "; WIDGET_CLOSE=" -#ifdef IGL_HEADER_ONLY_WAS_NOT_DEFINED +#ifndef IGL_STATIC_LIBRARY_WAS_NOT_DEFINED # undef IGL_HEADER_ONLY #endif "; diff --git a/scripts/h2pair.sh b/scripts/h2pair.sh index c5093f1fc..4cb9ab077 100755 --- a/scripts/h2pair.sh +++ b/scripts/h2pair.sh @@ -71,13 +71,13 @@ $after" | sed '1,/endif/d'`; then after=`echo "$after -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY // Explicit template specialization #endif"` fi echo "$before -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include \"$filename.cpp\" #endif diff --git a/style_guidelines.html b/style_guidelines.html index 1d0e7186d..412769ad5 100644 --- a/style_guidelines.html +++ b/style_guidelines.html @@ -51,7 +51,7 @@ namespace igl IGL_INLINE bool example_fun(const Printable & input); } -#ifdef IGL_HEADER_ONLY +#ifndef IGL_STATIC_LIBRARY # include "example_fun.cpp" #endif @@ -76,7 +76,7 @@ IGL_INLINE bool igl::example_fun(const Printable & input) return true; } -#ifndef IGL_HEADER_ONLY +#ifdef IGL_STATIC_LIBRARY template bool igl::example_fun<double>(const double& input); template bool igl::example_fun<int>(const int& input); #endif diff --git a/tutorial.html b/tutorial.html index f3a748079..d011afdf2 100644 --- a/tutorial.html +++ b/tutorial.html @@ -81,12 +81,12 @@ 

 ...
 #include <igl/some_other_igl_function.h>
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
 #  define IGL_HEADER_ONLY
 #  define IGL_HEADER_ONLY_WAS_NOT_DEFINED
 #endif
 #include <igl/igl_function_to_inline.h>
-#ifdef IGL_HEADER_ONLY_WAS_NOT_DEFINED
+#ifndef IGL_STATIC_LIBRARY_WAS_NOT_DEFINED
 #  undef IGL_HEADER_ONLY
 #endif
 #include <igl/yet_another_igl_function.h>
@@ -126,7 +126,7 @@
           is intended to be compiled into the statically linked libigl library
           then function is only compiled for each explicitly specialized
           declaration. These should be added at the bottom of the corresponding
-          .cpp file surrounded by a #ifndef IGL_HEADER_ONLY.
+          .cpp file surrounded by a #ifdef IGL_STATIC_LIBRARY.
         

 
         

@@ -173,7 +173,7 @@ Undefined symbols for architecture x86_64:
         

         

 ...
-#ifndef IGL_HEADER_ONLY
+#ifdef IGL_STATIC_LIBRARY
   // Explicit template specialization
   template Eigen::Matrix<int, -1, -1, 0, -1, -1> igl::cat<Eigen::Matrix<int, -1, -1, 0, -1, -1> >(int, Eigen::Matrix<int, -1, -1, 0, -1, -1> const&, Eigen::Matrix<int, -1, -1, 0, -1, -1> const&);
 #endif
diff --git a/tutorial/cmake/FindLIBIGL.cmake b/tutorial/cmake/FindLIBIGL.cmake
index 64624db8c..13c324c98 100644
--- a/tutorial/cmake/FindLIBIGL.cmake
+++ b/tutorial/cmake/FindLIBIGL.cmake
@@ -20,9 +20,9 @@ FIND_PATH(LIBIGL_INCLUDE_DIR igl/readOBJ.h
 if(LIBIGL_INCLUDE_DIR)
    set(LIBIGL_FOUND TRUE)
    set(LIBIGL_INCLUDE_DIR ${LIBIGL_INCLUDE_DIR}  ${LIBIGL_INCLUDE_DIR}/../external/Singular_Value_Decomposition)
-   if(NOT LIBIGL_USE_STATIC_LIBRARY)
-      add_definitions(-DIGL_HEADER_ONLY)
-   endif(NOT LIBIGL_USE_STATIC_LIBRARY)
+   if(LIBIGL_USE_STATIC_LIBRARY)
+      add_definitions(-DIGL_STATIC_LIBRARY)
+   endif(LIBIGL_USE_STATIC_LIBRARY)
    #set(LIBIGL_SOURCES
    #   ${LIBIGL_INCLUDE_DIR}/igl/viewer/Viewer.cpp
    #)