Commit 056158ab authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Towards VS2013 compatibility

- Core components now compile
- Boost 1.55, ITPP, VRPN and Ogre should be provided as VS2013 versions
  and re-enabled
parent b23468d0
......@@ -39,7 +39,7 @@ IF(WIN32)
# Switch /arch:SSE2 enables vectorization. Remove if your CPU/compiler doesn't support it.
SET(OV_EIGEN_FLAGS "/arch:SSE2")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4355 /MP ${OV_EIGEN_FLAGS}")
SET(OV_WIN32_BOOST_VERSION "1_47")
SET(OV_WIN32_BOOST_VERSION "1_55")
ELSEIF(UNIX)
# check for c++11 support
INCLUDE(CheckCXXCompilerFlag)
......
......@@ -15,6 +15,9 @@
# ---------------------------------
IF(WIN32)
MESSAGE(STATUS "Disabling ITPP until recompiled with VC120 ...")
RETURN()
FIND_PATH(PATH_ITPP include/itpp/itbase.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/itpp)
IF(PATH_ITPP)
SET(ITPP_FOUND TRUE)
......@@ -24,6 +27,7 @@ IF(WIN32)
SET(ITPP_LIBRARIES_DEBUG itppd)
SET(ITPP_LIBRARY_DIRS ${PATH_ITPP}/lib )
ENDIF(PATH_ITPP)
ENDIF(WIN32)
IF(UNIX)
......
......@@ -20,6 +20,9 @@ IF(OV_DISABLE_OGRE)
ENDIF(OV_DISABLE_OGRE)
IF(WIN32)
MESSAGE(STATUS "Disabling OGRE until recompiled with VC120 ...")
RETURN()
FIND_PATH(PATH_Ogre3D include/OGRE/Ogre.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/ogre $ENV{OGRE_HOME})
IF(PATH_Ogre3D)
SET(Ogre3D_FOUND TRUE)
......
......@@ -3,6 +3,12 @@
# Sets PATH_VRPN if found
# ---------------------------------
# The first ${..}/vrpn path is for Windows, the second ${..}/ for Linux
IF(WIN32)
MESSAGE(STATUS "Disabling VRPN until recompiled with VC120 ...")
RETURN()
ENDIF(WIN32)
FIND_PATH(PATH_VRPN include/vrpn_BaseClass.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/vrpn ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
FIND_PATH(PATH_VRPN include/vrpn_BaseClass.h PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/vrpn ${OV_CUSTOM_DEPENDENCIES_PATH})
IF(PATH_VRPN)
......
......@@ -49,8 +49,8 @@ IF(WIN32)
STRING(REGEX MATCH "vc120.*" MSVC_VER120 ${MSVC_SERVICE_PACK})
IF(MSVC_VER120)
SET(LIB_BOOST "libboost_${BOOST_COMPONENT}-vc100-mt-${BOOST_VERSION}.lib")
SET(LIB_BOOST_DEBUG "libboost_${BOOST_COMPONENT}-vc100-mt-gd-${BOOST_VERSION}.lib")
SET(LIB_BOOST "libboost_${BOOST_COMPONENT}-vc120-mt-${BOOST_VERSION}.lib")
SET(LIB_BOOST_DEBUG "libboost_${BOOST_COMPONENT}-vc120-mt-gd-${BOOST_VERSION}.lib")
ENDIF(MSVC_VER120)
SET(LIB_BOOST_PATH "-NOTFOUND")
......
......@@ -10,6 +10,8 @@
#include "../visualisation/ovkCVisualisationManager.h"
#include "../ovkGtkOVCustom.h"
#include <algorithm> // std::min, etc on VS2013
#if defined(TARGET_HAS_ThirdPartyOgre3D)
#include "ovkCOgreVisualisation.h"
#include "ovkCOgreObject.h"
......@@ -1478,8 +1480,8 @@ boolean CSimulatedBox::markOutputAsReadyToSend(
}
// sets start and end time
m_vCurrentOutput[ui32OutputIndex].setStartTime(min(ui64StartTime, ui64EndTime));
m_vCurrentOutput[ui32OutputIndex].setEndTime(max(ui64StartTime, ui64EndTime));
m_vCurrentOutput[ui32OutputIndex].setStartTime(std::min(ui64StartTime, ui64EndTime));
m_vCurrentOutput[ui32OutputIndex].setEndTime(std::max(ui64StartTime, ui64EndTime));
// copies chunk
m_vOutput[ui32OutputIndex].push_back(m_vCurrentOutput[ui32OutputIndex]);
......
......@@ -274,7 +274,10 @@ namespace OpenViBEPlugins
uint32 count = 0;
for( ; count<m_ui32SamplesPerBuffer && !m_bEndOfFile; count++)
{
m_bEndOfFile = (getline(m_oSignalFile, l_oLine) == NULL);
if( !getline(m_oSignalFile, l_oLine) )
{
m_bEndOfFile = true;
}
l_oStringStream.clear();
l_oStringStream.str(l_oLine);
......
......@@ -54,7 +54,7 @@ boolean CBoxAlgorithmSharedMemoryWriter::initialize(void)
m_vDecoder.push_back(new OpenViBEToolkit::TStreamedMatrixDecoder < CBoxAlgorithmSharedMemoryWriter >());
ShmString l_sShmVariableName("Matrix", alloc_inst_string);
l_sShmVariableName += ShmString(convert.str().c_str(), alloc_inst_string);
l_vMetaInfoVector->insert(std::make_pair<const ShmString,CIdentifier>(l_sShmVariableName,l_oTypeIdentifier));
l_vMetaInfoVector->insert(std::make_pair(l_sShmVariableName, l_oTypeIdentifier));
const ShmemAllocatorMatrix alloc_inst(m_oSharedMemoryArray.get_segment_manager());
m_vStreamedMatrix.push_back(m_oSharedMemoryArray.construct<MyVectorStreamedMatrix>(l_sShmVariableName.c_str())(alloc_inst));
......@@ -66,7 +66,7 @@ boolean CBoxAlgorithmSharedMemoryWriter::initialize(void)
m_vDecoder.push_back(new OpenViBEToolkit::TStimulationDecoder < CBoxAlgorithmSharedMemoryWriter >());
ShmString l_sShmVariableName("Stimuli", alloc_inst_string);
l_sShmVariableName += ShmString(convert.str().c_str(), alloc_inst_string);
l_vMetaInfoVector->insert(std::make_pair<const ShmString,CIdentifier>(l_sShmVariableName,l_oTypeIdentifier));
l_vMetaInfoVector->insert(std::make_pair(l_sShmVariableName, l_oTypeIdentifier));
const ShmemAllocatorStimulation alloc_inst(m_oSharedMemoryArray.get_segment_manager());
m_vStimuliSet.push_back(m_oSharedMemoryArray.construct<MyVectorStimulation>(l_sShmVariableName.c_str())(alloc_inst));
......
......@@ -22,6 +22,7 @@ INCLUDE("FindThirdPartyLua")
INCLUDE("FindThirdPartyOpenAL")
INCLUDE("FindThirdPartyBoost")
INCLUDE("FindThirdPartyBoost_Thread")
INCLUDE("FindThirdPartyBoost_System")
# ---------------------------------
# Finds standard library winmm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment