From Mathias Froehlich, "Attached are most of the fixes that are required to build osg on solaris and
hpux. I have skipped irix this time as irix is too dead to keep osg building there. As usual, solaris does not like member templates in stl containers. Some headers missing and link problems due to missing libraries."
This commit is contained in:
@@ -363,7 +363,9 @@ int main(int argc, char **argv)
|
||||
if (!sanityCheck)
|
||||
{
|
||||
osg::ref_ptr<osgQt::QWidgetImage> widgetImage = new osgQt::QWidgetImage(widget);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(4, 5, 0))
|
||||
widgetImage->getQWidget()->setAttribute(Qt::WA_TranslucentBackground);
|
||||
#endif
|
||||
widgetImage->getQGraphicsViewAdapter()->setBackgroundColor(QColor(0, 0, 0, 0));
|
||||
//widgetImage->getQGraphicsViewAdapter()->resize(800, 600);
|
||||
graphicsScene = widgetImage->getQGraphicsViewAdapter()->getQGraphicsScene();
|
||||
|
||||
@@ -6,6 +6,15 @@ SET(TARGET_SRC
|
||||
|
||||
IF (WIN32)
|
||||
SET(TARGET_EXTERNAL_LIBRARIES ws2_32)
|
||||
ELSE(WIN32)
|
||||
CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME)
|
||||
IF(LIB_NSL_HAS_GETHOSTBYNAME)
|
||||
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} nsl)
|
||||
ENDIF()
|
||||
CHECK_LIBRARY_EXISTS("socket" "socket" "" LIB_SOCKET_HAS_SOCKET)
|
||||
IF(LIB_SOCKET_HAS_SOCKET)
|
||||
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} socket)
|
||||
ENDIF()
|
||||
ENDIF(WIN32)
|
||||
|
||||
#### end var setup ###
|
||||
|
||||
@@ -40,8 +40,6 @@
|
||||
|
||||
#include <osgViewer/CompositeViewer>
|
||||
|
||||
#include <osgFX/Scribe>
|
||||
|
||||
#include <osg/io_utils>
|
||||
|
||||
class MyPager : public osgDB::DatabasePager
|
||||
|
||||
@@ -227,7 +227,7 @@ void TextTechnique::finish()
|
||||
void TextTechnique::traverse(osg::NodeVisitor& nv)
|
||||
{
|
||||
// OSG_NOTICE<<"TextTechnique::traverse()"<<std::endl;
|
||||
if (_textNode) _textNode->Group::traverse(nv);
|
||||
if (_textNode) _textNode->osg::Group::traverse(nv);
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user