diff --git a/build/Makefile.conf b/build/Makefile.conf index 29e1ab5d91..91e0e79b0d 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 f3b6c7083b..f26e55ae8f 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 ca6c0b64ea..f62274fdd8 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 b0322d284d..28d97fae69 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 015ca88c5d..c32f62dbc3 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 5880a8a063..d6f671fd7d 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 7759eb827a..49de6dbab5 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 cec1529038..78cda5e1ff 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 0bbb08ba3b..1a47c48bb4 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 6f969bc372..ddfbf78e36 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 4c7d1d0d47..0888df2c4f 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 9d5db710ef..062652eb2b 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 9a8ab2e82d..905e7dd57b 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 269619b55e..bb6c0fdda7 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 cec1529038..78cda5e1ff 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 4c7d1d0d47..0888df2c4f 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 492026c742..46e0ef2524 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 8f1f8e821b..a796aff20e 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 5880a8a063..d6f671fd7d 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 1fbf2d5423..89dbe1d073 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 9d5db710ef..062652eb2b 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 f91eacc986..eab62cc88c 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 e98c6cb5e4..70df79d8af 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 59d8ce8128..bde2d870a6 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 ddac78ec6a..b5522285f0 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 5880a8a063..d6f671fd7d 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 5880a8a063..d6f671fd7d 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 4c7d1d0d47..0888df2c4f 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 966c49a962..4e902c910f 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 1a0b5612a3..52a342bae8 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 7759eb827a..49de6dbab5 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 3c1bf7adb9..ee7f6eb17b 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 12d374319d..d8cdaad999 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 00e6c34940..e52069a377 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 1b6732fe26..2052b64540 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 26ada0fe4d..ee2ff4efe2 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 ef67868293..0a07b72ac6 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 bf8c3eb85c..c12ceadac4 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 0188f78ced..c185eea7f1 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 bd6a6deaeb..7438cde428 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 56b496ce62..4fbf450c12 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 23ef9d0a79..40d1c958e3 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 21de9fa8df..6dcc55a8b4 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 67de970f5b..3574396aaf 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 5b482224fe..9acc1b7307 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 e8cedeb1d8..35b100ace0 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 737611b1a6..8b02635e03 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 edf00963ed..35da9ae96f 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 e10fd47541..70f9bd6e75 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 a3efdbd9b1..8dfb744f6a 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 1b15d4afbd..5a1c370c12 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 17af9e7ba1..249858bb73 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 dc2f23c230..c7e7020d9d 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 ae67722231..858ae89d9d 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 2f0aff2610..f7f4dffa86 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 e4572be61f..5bfcef9549 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 d41e21c1b6..6533b1becd 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 d07d236eca..79738c822f 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 88d07e9d26..1ef908d80a 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 4b6d9d62bc..19ebf2e540 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 364f8d8484..06e1ae025d 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 f7498f58e4..5ca167fb25 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 926ee8b260..6ca17b358f 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 63abafb2c0..3bbaa6a08f 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 01a7231ce6..5a3ba55f58 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 589331d2f5..5eb56e9b6c 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 383ed48d01..f780764dd3 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 9cd654bf39..b37f397d8f 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 1563ab2860..15d180170b 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 1bae32449c..017ecbd797 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 95716ee312..9673e6ab6a 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 16d47df1dd..ca18bbd0b9 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 91d6fed9a0..d5b5499889 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 059c9cc9b1..ae5e5df863 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 e85e9c1b74..7acb61f08a 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 ff9fde9221..609682eaf9 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 71d6ae8d3f..68368d813b 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 2299115f48..d89025bd55 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 e0a9bca4e5..00e3435cf5 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 d473191e83..86d90112dd 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 ba40e4623e..b01cba8a6d 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 e27f181500..3cab7c2ad8 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 9fefb29fec..7b1fc5c5e0 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 349e860242..b6acee904d 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 6ed451b3d3..91d0e65812 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 1fe056881f..55f48ebcfc 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 b746cd554e..6aceaa92de 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 708d86d601..e49a7f5b82 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 232c0213c4..6fa9c7c896 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 d01321e302..964baef849 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 d3f3f98816..9773aea05e 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 755f153119..0980edae1e 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 fb0b430b94..056112297b 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 34601bac21..29c165ba3e 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 87a76bd69b..5433c38b5c 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 da7f93dbc0..418762363b 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 d39a189951..1bb453af19 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 51ae61d436..3674b030ed 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 3175ff9245..fa3b576485 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 311f43f89d..912b33da5b 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 91adfdd1d3..6625d47a7a 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 0da962884a..1769aaac00 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 3c51a26426..e6eeee543d 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 3e59575fa4..d625891700 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 bbf2318422..01a1639d83 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 caa8fd8926..fdd00d8abc 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 b72d030f5e..4c853febfc 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 931af9916f..e4333c7a32 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 bbbb34dd9d..4738770fd0 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 33275f471f..6edec856d8 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 660821e4a8..9cbe72b710 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 8378196dfc..e70c77ab13 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 08cbfd1946..1b5b535193 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 262c28c432..a33e2a562f 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 4551fb7288..69c98ebe9a 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 6ef39204e1..d1d48d26c1 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 a68d4f3847..a1b68668e3 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 5e45c54e35..1d8b1dfcb3 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 2ec0d6a636..3e63422823 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 ec78d36ded..04ee5340bc 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 00e2514727..cfbe563ed1 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 dea95d4a02..a01e909d95 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 82bf5755e5..73a1f28d0f 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 0cd1f7c5f7..260fbee185 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 113213c6f5..12423e035f 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 5e16492c76..fdbba77a28 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 b9d4f1f6ed..f14f0e5691 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 7f628bab55..5f002bb80c 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 73bcb28f53..8001f01b63 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 7643b55551..c34694cde9 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 318cf95a4d..92ac0f8625 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 2a25609c74..aa7cd74ae8 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 b536e00670..9494eac7b6 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 7ab991287a..885f4e34f6 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 098f0f7d7a..2c64e1bf99 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 a98fc631ff..71d6325616 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 2b5b622236..8313afee2e 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 a08f53d3b1..862132aa8f 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 bcfb9744cb..9b53ae1c70 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 19bd0b1384..7e7966c2f3 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 17f12d7292..cf9020e7ba 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 542ef4c70b..a829da1f5d 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 bc142731f1..1986b6a975 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 518a1d260b..947c8376df 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 51a7f18b4b..2dd8b2ef69 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 ee09e41dfe..53a4953914 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 9b92579ff3..6018f7876e 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 d55b077fbe..a2d923d341 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 432c451d2c..818766d924 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 a35037ba54..9423135b80 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 a13e79f2cb..30a40ce38b 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 aed11214e0..2e7832bc81 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 6fe6e3300b..efe33fdd2a 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 6193bb69e2..b54dcec36d 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 e5e5d9dfd5..5919db1fe0 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 088f1aa45f..f8d35db522 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 980608eee4..33e328afed 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 54f13f03f1..cea882decc 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 b257daded2..677f3f25c4 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 9138ab18cf..b68c7c5bbf 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 c8da955c37..4cb362b10c 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 931fbeda72..762bd79b51 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 91e60e9719..8bc7514703 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 78dac4c1c4..2b766e25e7 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 2258997df6..16c9ec6459 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 e9f4851170..9a1f8135e1 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 77722e7609..ae6b632cdb 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 654a1a814a..6d867afe93 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 0be186bdca..cf80af92d5 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 d3d031db91..c495847c7e 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 c2077f42b7..884aba420f 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 c287b1e126..92d1d5565d 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 5c62f0d571..bceb098cf0 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 cae52952f7..1b17ea4c6a 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 b8eaec1bf9..f040757589 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 381fb0bdab..fe982aac45 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 14c394c493..af055d9781 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 bf9ca8820a..deb32a7b7c 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 bb254b8c6a..39b7446fb7 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 3d86d71060..737efa77c0 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 0dba5b31cd..83f11738f2 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 b89669c1ca..f69ce811b4 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 37abe6922f..0da1e4d342 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 7f0b8013c2..a84d52068a 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 671535bde8..93070508ff 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 cbb5a2d736..b19be51672 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 294c7ac0c3..889c0f549c 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 2a73ffccb8..6479a1efda 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 17ca8c4a56..6bf3b6aa61 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 591e7d5ac0..f9bdd3d5f2 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 2b7becd697..67388fbee7 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 e5cdd92102..9b1238cebb 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 25c5cee458..60d2e466da 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 93cb051cda..ae7d2043bf 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 852a756f36..08daee1c3d 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 ef08771c9d..abe8956b5c 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 8d0d6ade7a..e8f9d274bc 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 e2e205a78d..59453992c0 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 6c989e33fa..cca64afd1d 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 8ffc1f3257..61d966e2c0 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 024e2cc0d2..805544b0bc 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 82a1942276..a57355ceed 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 c5a98ace19..bbf5165ebd 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 8332993ac3..8f1842898f 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 6666e632fe..d026e83497 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 751fbb35c8..9379c10e2e 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 faa3448fb7..205757425e 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 44335cd581..20c9630e4f 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 d5d6c705b0..2bd3a61635 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 6429a57251..9e9c5f07be 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 c39a40e41f..dd2d066d1d 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 52def2712d..deafa05f33 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 801f852f11..be4da91e5a 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 b76d7e975e..1080b42e5f 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 e7bea719eb..2194b3f14d 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 d031097b3d..aa2339bed8 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 05b4356cdf..e755527288 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 641d1eb00e..68e30a5640 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 90d1696fbd..5610c7ff33 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 99af36f2b8..7025a06b15 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 885f238c25..4f1f361466 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 dfc75d04d3..40aef5c051 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 223899c8ec..6897012853 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 f7e78caede..272ebe9b9d 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 c90043f8d6..9547bb8e80 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 be06496af5..55847020cc 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 b87ff35970..31725298e6 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 756e6ca982..8834e8afbb 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 f4529ed04a..8d38a27536 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 f3f0fbe595..f592bc512e 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 bfc7940f33..09ae802fe1 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 1cb111f8c1..8883196b4d 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 44ce78b093..8a324bb228 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 98014952f8..307273d209 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 efef7bef78..ec75b8088f 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 cbd4105707..f96ba2601b 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 e3cf5db634..635b89170b 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 498612618b..6d7eaf4044 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 42be65163e..fa433cc3c9 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 c8425a5bb4..9dd0782007 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 884f2fe7e4..542f30c1ec 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 9faf501e5b..551d338d79 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 e11c8dd416..f1802f7fb0 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 71f9da3382..2e602b6c3d 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 323c1491b9..6ae2ced04f 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 2cd6534046..d20dd84d9e 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 18086518e4..d433049612 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 4415276f8a..d33376cc8f 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 2a69cc37c7..ef06184431 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 88387ced3a..ee2d6f63de 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 fee377f4f0..f04657bc9c 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 867c5a0eb6..69d8dc9605 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 de823c7452..ee8db4ed35 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 35cddacbd5..40db25b4ed 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 b1cb419e12..9adca15b60 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 d650d482dc..11c766a190 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 16fc9786cb..91b374c20d 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 c13135e9f4..acea683f77 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 ccd3ba96c8..e066737c72 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 7a0542ae6c..10a3a5ea5e 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 64efc60247..72874caa4d 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 a8e6f61587..c484f77692 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 d6efda52d7..f27f45a753 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 3f2175e094..a3069e9af4 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 6b8aa58846..4aab990f4b 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 598b8e23f4..4a91885eb8 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 28ddf2b174..ba3814608f 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 e2b0f3f264..ceecb981e5 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 4e918723db..c5a61ba53a 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 91a699be61..24b0f2bf2f 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 529dc529bd..58035d4cee 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 d2a730b094..5f06486d7e 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 11ba8ed793..b2c429c87b 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 7fc10a453d..3d115168ad 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 995c3505f5..1da94d52e3 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 bbe39c9be8..1fd0c39ca8 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 eb0505716c..6913a489f5 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 eabc4828df..e440362790 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 e84e19a055..4591c6200c 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 a84ed34e19..4d09438812 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 b5dfebd489..a7f2e84fa0 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 44b4746b09..5f62ae7b20 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 73796139ac..5ed86716f9 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 7f426c0515..7205179da3 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 4e36353518..5fa6e89ec3 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 754cb1c661..3c7c2abcc3 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 de316cfe28..39a5dfd04b 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 638bf46d11..e97759b178 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 4c90c6c34b..2ce3a0bd23 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 ebb228b1cf..c305c0f65b 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 648ab7e644..32f8deafd1 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 d4bb9cc8dc..a832e82a60 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 ba3383b972..c60bdf6483 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 7101db9159..d624c112a1 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 7bb877898b..012f9c9a88 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 b0b49328b6..40037aa331 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 d2e18b9650..a77cd6593c 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 90afe55397..167ebd0d7a 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 291d3a98c2..169c3400bc 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 ce8e301e9e..503860d12c 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 9b3eb42d6b..6419589ada 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 49e067d276..2236ee0df9 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 95674e0ee2..54b3992c0f 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 7c42d4f8c9..013f18ada4 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 589495898f..2713d93f39 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 b1a795d69d..6628102366 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 b45408be47..9e3a088908 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 78bcd2fac1..b8a844fe07 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 bdfe654d08..2aa170d5e6 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 fc5f6277c3..9195be8d14 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 cace1e6049..9dd3be0ee1 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 5170c3e444..1247c60d25 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 b7d4dcd9ca..819676f3e1 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 54e89d90af..31252ea660 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 eddec89a7a..1de9e9f4f8 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 6e1bf66c76..fade671e7a 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 0ea74cc3f4..0b14099c70 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 946ed93ae4..f19344c405 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 7aca82dee3..2b9c6e51b4 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 59028d53a4..d5f6c86625 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 72e2a9e223..2b995eabe1 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 b3a5b3fd96..8ba2fd6989 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 90e2273387..13d3f38730 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 05fe885061..e5446a8f4d 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 7539b769f9..58291856f8 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 f236245af5..d5acc72a36 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 13c37ee7c5..7f70d3e93d 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 6db329f483..738c2cda03 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 cb5b2c450b..6127dfb67f 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 b9bb0408f4..e45c1a76ca 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 04ec05ef85..66f7a71e1f 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 42efdac4c9..6e6ea463f2 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 bd5d35f37f..10e4de3e6d 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 e2dee43f48..69c1a349e2 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 9d4b89785c..3ac48c28e9 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 dc280cb5ab..73ca0b8b5f 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 136cc8e3f0..cc79308cc4 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 16d837b643..5db64585e8 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 4e461df294..711930bbe1 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 7b808dac66..c789f41275 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 1a1db2e070..178350d95a 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 a81609613c..32ccb3b5b2 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 7bab42693c..7eaa025907 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 d92c527b8b..4a7ba654f4 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 a633cfa765..77ea10e5c4 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 4da4364ff2..370e4fe29d 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 226fd105ec..4291b291ec 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 876bf1ffc9..4a7795ae14 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 8963a1d21c..78027db050 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 eac1ab1a6c..e8a6dbd9c2 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 56162fbcce..2bb41fa777 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 0ba963b048..41c6448377 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 ccf573d892..bc3244e0f7 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 f95d89f4b4..60b4b47490 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 2591408e1e..b4dfea3794 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 18f4cdd81d..a8f57fa343 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 51ec68365b..480aad1293 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 f00d6f27e1..a73ff18123 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 c83b0a37c9..e09c492c12 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 36ce4461ad..299c916062 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 dad343dcd8..fa363d255b 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 525010884d..a073c0c957 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 5360bb6ffe..a4bdb4774a 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 cc548485c9..25493430de 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 41765d7e1e..dca08fc25b 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 70b8023ece..a02b9dc248 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 26371edd08..7392f6df89 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 c4fb9c4777..29e1994ade 100644 --- a/include/igl/readSTL.cpp +++ b/include/igl/readSTL.cpp @@ -213,7 +213,7 @@ IGL_INLINE bool igl::readSTL( 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 f9cf976761..101716d694 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 4416be077f..8111b519c6 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 d028eebcd0..f16f0d1df8 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 b2c0177abf..8f2e8d6771 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 fb5935716e..e3d2bee391 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 aee25dffcf..89af64afe0 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 b101d93caa..352b99922f 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 bc4521389f..c2d4380336 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 868623c1d6..820274c5ff 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 5d316418b8..ad31a3cbe3 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 45c8e0328a..b39ec64e6b 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 33d7564bb9..beeb84511b 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 1701083d79..7746c74530 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 fc72faa047..e9d4cc0523 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 399fef2eda..50f7d7b0fb 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 4eaaaa526f..033fb65cce 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 a19213137f..7794433745 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 6649dabc19..0e55577689 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 3d14b78890..91de78e85b 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 82db8f37d2..136f211056 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 2421e52ac2..7726adcb40 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 b20f1e24c4..78133d4ef9 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 b2fed9d558..da77a53af7 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 8a97cc622e..5ffd5b21c1 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 94b3cf183f..b452048399 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 8f8c09fb23..5809dd8629 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 1c69ae1b97..a1b64bccad 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 7f77a5e793..0bf1e4b4e8 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 7461478751..aa63ab23e6 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 3cd280c9e0..44de48d390 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 a2e3ed1666..cdaac731bf 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 d297f4de33..9a0d523354 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 50d170e47a..8f62b5a2d0 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 03bc160f9f..96822736f0 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 b4c3ed8c8d..c702599b09 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 f95d18a4e6..b22cfcd420 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 d4fe5c2299..1c3dc426ef 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 093dae8f01..a4a6f57e27 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 b80878fb7a..f2b55e1d28 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 e534c0fad3..7be7a29204 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 ea8adf046b..2072ca836a 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 82d862c084..432f286a4c 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 49bb4f92de..b7518ff981 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 239c99fcbb..14ab81b4f6 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 aa0193744a..d7bc3b6edf 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 aa9382aa3b..c2273219e8 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 52eabee28d..72b49f33b8 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 83d5001e1b..2da67882b3 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 8840ed8f41..5cee41b33e 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 c8167903bc..86296f22a7 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 1e6d2ac389..f18683b3e9 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 5b4cdbb3cb..3b34bc2e54 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 ee619d25b0..fa6dae4b3b 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 c878168d06..76c96c5b20 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 f4532a3993..4c24255713 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 88d8c2a120..ae35219ea5 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 10f6cb6ebe..5983657ec6 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 3f74196ee7..4ef04994f0 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 c6649db001..cc9773bf24 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 6b016af7b6..92070e0c96 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 589b3955d3..8d59bfceb5 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 05a72fdb37..c9ff165746 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 c12e7a5415..cb6fe647d1 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 5968a13386..1a8a626d3b 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 09847b2c50..237e09047c 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 64b2362dd4..b4f1036744 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 9a23ee9ee0..180f29a4c3 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 b303c6f15e..24742d2d6d 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 ebd9c62535..3322fd353c 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 6d98336100..541127e3b5 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 e577f112d2..11d5d24c3c 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 12f7e8e2fe..31a84e97eb 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 f2e9ec9ced..0a85b83830 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 c1c82f0272..461f9c9ec1 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 0b324e2146..755fb13bc1 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 31981d3330..dbc3201b32 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 c2d4e69442..b7cdbe2d73 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 9df4302b23..26be97ad9e 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 0f4c1c34f3..78f1cc123a 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 405047336a..1a5e5e2bba 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 befe5b3a25..5053ec88e7 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 6c0613a592..83cc61ed45 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 5d7c5c27e6..c90584d06c 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 5e533d0bae..65ce89fbd3 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 32340b4d05..90f82483b5 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 9a8e378db0..88c028dcab 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 758e2188bd..d6dcb45e73 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 ca4067aa4b..51e0e982d8 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 a9eb72b962..9778ada51c 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 95ea66b699..5ff712e62a 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 49a473fda7..ff7c12bc7d 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 123f54b74d..5ed5e35c52 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 1707d2adc2..8084339338 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 af327a4d1a..3420edfa7e 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 44a610e673..818dd47319 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 7d2d07dbe5..d55f9f4a8c 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 bec902be88..9aafe50018 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 a2ad2ff65b..fe3cbec8ad 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 bf2145c90a..8b81bdef64 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 c11b35586e..bb04562125 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 966f90ffa1..ee5f22e873 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 522c9f728e..20da8579d4 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 e81289f717..59e67f6610 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 ee18078463..9980da1b8a 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 7ffcf81a70..a46dce745e 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 f92f68141f..ab86148df1 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 fcff35a2bc..260a21462a 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 c108b2cc78..fc62882250 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 773295baa0..fbf1e1e8fc 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 ae50a4d74c..c7ca965124 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 73486182ee..409bad10ef 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 c197657c9e..ddbb9666a4 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 10957007ff..f481e06995 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 1840ca95fa..bcc462d579 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 3951e90bf4..4bb51418ed 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 2ca56f998f..1450a8db76 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 a5a00ad9e6..c2bbb0ba2f 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 7e6cee4fd4..d45d02d176 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 3df9f97601..93cdad57a0 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 3988c05a64..1ffd202818 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 ff5a4d70c1..999584463a 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 2a4a9068fa..93365095ec 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 39c3213c6e..3986b36e6c 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 1dd7730161..3120f5d40d 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 c5093f1fc2..4cb9ab077d 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 1d0e7186d2..412769ad55 100644 --- a/style_guidelines.html +++ b/style_guidelines.html @@ -51,7 +51,7 @@

example_fun.h

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 @@

example_fun.cpp

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 f3a7480797..d011afdf24 100644 --- a/tutorial.html +++ b/tutorial.html @@ -81,12 +81,12 @@

Headers (.h) only library


 ...
 #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 @@ 
Explicit
           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 @@ 
Explicit
         

         

 ...
-#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 64624db8c2..13c324c989 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
    #)