Commit 0504f5ea authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[FIX] make it compile with MSVC again

parent c22f4c71
......@@ -272,6 +272,7 @@ ADD_EXECUTABLE( walnut OpenWalnut.cpp version.h )
TARGET_LINK_LIBRARIES( walnut ${OWKernelName} ${OWDatahandlerName} ${OWguiName} ${OWguiqt4Name} ${OWCommonName} ${OWgeName} ${Boost_LIBRARIES} )
IF(MSVC_IDE)
ADD_DEFINITIONS( -DEIGEN_DONT_VECTORIZE -DEIGEN_DONT_ALIGN -DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT )
SET_TARGET_PROPERTIES( walnut PROPERTIES DEBUG_POSTFIX "d")
SET_TARGET_PROPERTIES( walnut PROPERTIES PREFIX "../")
ENDIF(MSVC_IDE)
......
......@@ -236,7 +236,7 @@ typedef WVector3D WPosition;
*
* \return the output stream
*/
OW_API_DEPRECATED std::ostream& operator<<( std::ostream& os, const WVector3D &rhs );
OW_API_DEPRECATED OWCOMMON_EXPORT std::ostream& operator<<( std::ostream& os, const WVector3D &rhs );
/**
......@@ -247,7 +247,7 @@ OW_API_DEPRECATED std::ostream& operator<<( std::ostream& os, const WVector3D &r
*
* \return the input stream
*/
OW_API_DEPRECATED std::istream& operator>>( std::istream& in, WVector3D &rhs );
OW_API_DEPRECATED OWCOMMON_EXPORT std::istream& operator>>( std::istream& in, WVector3D &rhs );
/**
* Multiplies a WVector3D with a scalar
......@@ -255,6 +255,6 @@ OW_API_DEPRECATED std::istream& operator>>( std::istream& in, WVector3D &rhs );
* \param lhs left hand side of product
* \param rhs right hand side of product
*/
OW_API_DEPRECATED WVector3D operator*( osg::Vec3d::value_type lhs, const WVector3D& rhs );
OW_API_DEPRECATED OWCOMMON_EXPORT osg::Vec3d operator*( osg::Vec3d::value_type lhs, const osg::Vec3d& rhs );
#endif // WVECTOR3D_H
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