From Mathias Froechlich, "Attached the collected fixes I needed to compile with all of them.

Most notable the __hpux define stuff. The __hpux__ variant seems to be not
defined which resulted in a compile error at this time. Consequently I have
replaced all occurances of __hpux__ with __hpux. And huge surprise: now osg
plugins are found and loaded correctly ...
The next notable one is the MSVC_IDE fix which makes the nmake Makefiles cmake
generator target behave like the ide one. Showed up because I started to do
scripted builds with nmake instead of devenv...
The rest is the usual bunch of stuff that just happens during normal
coding ..."
This commit is contained in:
Robert Osfield
2009-11-18 12:15:29 +00:00
parent 259daac9a9
commit b7cabac990
13 changed files with 29 additions and 32 deletions

View File

@@ -70,7 +70,9 @@ QGraphicsViewAdapter::QGraphicsViewAdapter(osg::Image* image, QWidget* widget):
_graphicsView = new QGraphicsView;
_graphicsScene->addWidget(widget);
_graphicsView->setScene(_graphicsScene);
#if (QT_VERSION_CHECK(4, 5, 0) <= QT_VERSION)
_graphicsScene->setStickyFocus(true);
#endif
_graphicsView->viewport()->setParent(0);
int width = _graphicsScene->width();
@@ -455,4 +457,4 @@ void QGraphicsViewAdapter::assignImage(unsigned int i)
GL_RGBA,GL_UNSIGNED_BYTE,
data,
osg::Image::NO_DELETE, 1);
}
}

View File

@@ -1,4 +1,5 @@
SET(TARGET_SRC osgautocapture.cpp )
SET(TARGET_ADDED_LIBRARIES osgTerrain )
#### end var setup ###
SETUP_EXAMPLE(osgautocapture)

View File

@@ -54,7 +54,7 @@
#elif defined (WIN32)
#include <winsock.h>
#include <stdio.h>
#elif defined (__hpux__)
#elif defined (__hpux)
#include <unistd.h>
#else
#error Teach me how to build on this system

View File

@@ -50,11 +50,8 @@ std::string createLibraryNameForWrapper(const std::string& ext)
#endif
#elif macintosh
return "osgwrapper_"+ext;
#elif defined(__hpux__)
// why don't we use PLUGIN_EXT from the makefiles here?
return "osgwrapper_"+ext+".sl";
#else
return "osgwrapper_"+ext+".so";
return "osgwrapper_"+ext+ ADDQUOTES(OSG_PLUGIN_EXTENSION);
#endif
}