Commit 1c61eec8 authored by James Goppert's avatar James Goppert

Fixed build for linux.

parent 18b0e07e
...@@ -158,6 +158,7 @@ linux-g++ { ...@@ -158,6 +158,7 @@ linux-g++ {
QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/. QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
INCLUDEPATH += /usr/include \ INCLUDEPATH += /usr/include \
/usr/local/include \
/usr/include/qt4/phonon /usr/include/qt4/phonon
# $$BASEDIR/lib/flite/include \ # $$BASEDIR/lib/flite/include \
# $$BASEDIR/lib/flite/lang # $$BASEDIR/lib/flite/lang
......
...@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void) ...@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON) if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
{ {
// rotate camera // rotate camera
#ifdef __APPLE__ #ifdef __WIN32__
osg::Vec3d axis;
#else
osg::Vec3 axis; osg::Vec3 axis;
#else
osg::Vec3d axis;
#endif #endif
float angle; float angle;
......
...@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) : ...@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
QWidget(parent,f) QWidget(parent,f)
{ {
setupUi(this); setupUi(this);
graphicsView->setCameraManipulator(new osgEarthUtil::EarthManipulator); graphicsView->setCameraManipulator(new osgEarth::Util::EarthManipulator);
graphicsView->setSceneData(new osg::Group); graphicsView->setSceneData(new osg::Group);
graphicsView->updateCamera(); graphicsView->updateCamera();
show(); show();
......
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