fly/flightgear
1
0
Fork 0
Code Activity

Windows / non-Qt build fixes

Browse source
This commit is contained in:
James Turner 2017-10-05 15:02:30 +01:00
parent e022e4fed5
commit 907420d3f4
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Main/CMakeLists.txt
View file

@ -182,9 +182,8 @@ if(ENABLE_FLITE)
endif() endif()
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
target_link_libraries(fgfs Qt5::Widgets fglauncher) target_link_libraries(fgfs Qt5::Core Qt5::Widgets fglauncher fgqmlui)
set_property(TARGET fgfs PROPERTY AUTOMOC ON) set_property(TARGET fgfs PROPERTY AUTOMOC ON)
target_link_libraries(fgfs fglauncher fgqmlui)
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

10
src/Viewer/renderer.cxx
View file

@ -112,8 +112,10 @@
#include "CameraGroup.hxx" #include "CameraGroup.hxx"
#include "FGEventHandler.hxx" #include "FGEventHandler.hxx"
#if defined(HAVE_QT)
#include <GUI/QQuickDrawable.hxx> #include <GUI/QQuickDrawable.hxx>
#include <Viewer/GraphicsWindowQt5.hxx> #include <Viewer/GraphicsWindowQt5.hxx>
#endif
#include <plib/pu.h> #include <plib/pu.h>
@ -1547,7 +1549,7 @@ FGRenderer::setupView( void )
osg::Geode* geode = new osg::Geode; osg::Geode* geode = new osg::Geode;
geode->addDrawable(new SGHUDDrawable); geode->addDrawable(new SGHUDDrawable);
geode->addDrawable(new SGPuDrawable); geode->addDrawable(new SGPuDrawable);
#if defined(HAVE_QT)
std::string rootQMLPath = fgGetString("/sim/gui/qml-root-path"); std::string rootQMLPath = fgGetString("/sim/gui/qml-root-path");
auto graphicsWindowQt = dynamic_cast<GraphicsWindowQt5*>(guiCamera->getGraphicsContext()); auto graphicsWindowQt = dynamic_cast<GraphicsWindowQt5*>(guiCamera->getGraphicsContext());
@ -1555,10 +1557,10 @@ FGRenderer::setupView( void )
_quickDrawable = new QQuickDrawable; _quickDrawable = new QQuickDrawable;
_quickDrawable->setup(graphicsWindowQt); _quickDrawable->setup(graphicsWindowQt);
_quickDrawable->setSource(QUrl(QString::fromStdString(rootQMLPath))); _quickDrawable->setSource(QUrl::fromLocalFile(QString::fromStdString(rootQMLPath)));
geode->addDrawable(_quickDrawable); geode->addDrawable(_quickDrawable);
} }
#endif
// Draw first (eg. before Canvas GUI) // Draw first (eg. before Canvas GUI)
guiCamera->insertChild(0, geode); guiCamera->insertChild(0, geode);
guiCamera->insertChild(0, FGPanelNode::create2DPanelNode()); guiCamera->insertChild(0, FGPanelNode::create2DPanelNode());
@ -1746,9 +1748,11 @@ FGRenderer::resize( int width, int height )
// update splash node if present ? // update splash node if present ?
_splash->resize(width, height); _splash->resize(width, height);
#if defined(HAVE_QT)
if (_quickDrawable) { if (_quickDrawable) {
_quickDrawable->resize(width, height); _quickDrawable->resize(width, height);
} }
#endif
} }
typedef osgUtil::LineSegmentIntersector::Intersection Intersection; typedef osgUtil::LineSegmentIntersector::Intersection Intersection;