fixed msvc12 build

qwertzui11 · Apr 28, 2015 · 168976d · 168976d
1 parent d7c3d67
commit 168976d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ IF(NOT EXISTS ${BOOST_ROOT})
   message(FATAL_ERROR "Could not find boost root: ${BOOST_ROOT}")
 endif ()
 if (MSVC)
-  find_package(Boost 1.55.0 REQUIRED COMPONENTS log log_setup system thread chrono date_time iostreams serialization unit_test_framework filesystem bzip2  )
+  find_package(Boost 1.55.0 REQUIRED COMPONENTS log log_setup system thread chrono date_time iostreams serialization unit_test_framework filesystem )
 else()
   find_package(Boost 1.55.0 REQUIRED COMPONENTS log log_setup system thread chrono date_time iostreams serialization unit_test_framework )
 endif()

diff --git a/examples/voxelterrain/source/customVertexInformation.cpp b/examples/voxelterrain/source/customVertexInformation.cpp
@@ -151,7 +151,7 @@ class customEdit : public voxel::edit::sphere<configType>
         return true;
     }
 protected:
-    customEdit(const sphere& desc)
+    customEdit(const ::blub::sphere& desc)
         : t_base(desc)
     {
         const uint32 colourToRand = math::rand()%3;
@@ -220,7 +220,7 @@ typedef voxel::terrain::renderer<t_config> t_voxelRenderer;
 typedef voxel::terrain::surface<t_config> t_voxelSurface;
 typedef voxel::edit::axisAlignedBox<t_config> t_editAxisAlignedBox;
 typedef voxel::edit::sphere<t_config> t_editSphere;
-typedef typename t_config::t_renderer::t_tile t_renderTile;
+typedef t_config::t_renderer::t_tile t_renderTile;
 
 
 void createSphere(t_voxelContainer *container, const vector3 &position, const bool &cut);

diff --git a/modules/procedural/source/blub/procedural/predecl.hpp b/modules/procedural/source/blub/procedural/predecl.hpp
@@ -10,7 +10,7 @@ namespace procedural
     {
         class config;
         class data;
-        class vertex;
+        struct vertex;
         namespace tile
         {
             template <class tileType>