Merge branch 'master' of https://github.com/schuellc/libigl

Former-commit-id: 5bc867a32d34b58406b6962aa0761f85267b6eb4

include/igl/viewer/TextRenderer.cpp

@@ -12,6 +12,8 @@
 #include <nanogui/opengl.h>
 #include <nanovg.h>
 
+#include <Eigen/Dense>
+
 #define NANOVG_GL3
 #include <nanovg_gl.h>
 

include/igl/viewer/TextRenderer.h

@@ -8,8 +8,7 @@
 #ifndef IGL_VIEWER_TEXT_RENDERER_H
 #define IGL_VIEWER_TEXT_RENDERER_H
 
-/* This class extends the font rendering code in AntTweakBar
-   so that it can be used to render text at arbitrary 3D positions */
+#include <Eigen/Dense>
 
 #include <igl/igl_inline.h>
 #include <map>

include/igl/viewer/TextRenderer_fonts.h

@@ -11,8 +11,10 @@
 
 #include <stdint.h>
 
+#ifndef IGL_STATIC_LIBRARY
 namespace
 {
+#endif
   extern uint8_t igl_entypo_ttf[];
   extern uint32_t igl_entypo_ttf_size;
 
@@ -21,7 +23,10 @@ namespace
 
   extern uint8_t igl_roboto_regular_ttf[];
   extern uint32_t igl_roboto_regular_ttf_size;
+
+#ifndef IGL_STATIC_LIBRARY
 }
+#endif
 
 #ifndef IGL_STATIC_LIBRARY
 namespace

tutorial/CMakeLists.txt

@@ -4,10 +4,14 @@ project(libigl_tutorials)
 message("Generated with config types: ${CMAKE_CONFIGURATION_TYPES}")
 
 SET(LIBIGL_USE_STATIC_LIBRARY 1)
+add_definitions(-DIGL_STATIC_LIBRARY)
 
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
 find_package(CORK QUIET)
 find_package(CGAL QUIET)
 find_package(EMBREE QUIET)