From 168976dd6b33fc41fc0bc65ee4d2fdae45f42660 Mon Sep 17 00:00:00 2001 From: Markus Lanner Date: Tue, 28 Apr 2015 09:07:04 +0200 Subject: [PATCH] fixed msvc12 build --- CMakeLists.txt | 2 +- examples/voxelterrain/source/customVertexInformation.cpp | 4 ++-- modules/procedural/source/blub/procedural/predecl.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd7f484..1f7c935 100644 --- 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 index cdce1aa..2a9c477 100644 --- a/examples/voxelterrain/source/customVertexInformation.cpp +++ b/examples/voxelterrain/source/customVertexInformation.cpp @@ -151,7 +151,7 @@ class customEdit : public voxel::edit::sphere 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_voxelRenderer; typedef voxel::terrain::surface t_voxelSurface; typedef voxel::edit::axisAlignedBox t_editAxisAlignedBox; typedef voxel::edit::sphere 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 index 6476f65..0f810c8 100644 --- 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