fly/flightgear
1
0
Fork 0
Code Activity

PUICamera Linux compilation fixes

Browse source 
* Correct the filename case in the #include directive in PUICamera.cxx,
  so that compilation succeeds on case-sensitive filesystems.
* Add the PU_SCROLL_UP_BUTTON and PU_SCROLL_DOWN_BUTTON #defines, as
  they are missing from some systems which ship old versions of the PUI
  library.
This commit is contained in:
Alessandro Menti 2017-10-21 11:20:07 +02:00
parent c1df6e9d15
commit 89ca665bfb
No known key found for this signature in database
GPG key ID: 467AC0B4D6A6F336
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Viewer/PUICamera.cxx
View file

@ -43,6 +43,14 @@
#include <Viewer/CameraGroup.hxx> #include <Viewer/CameraGroup.hxx>
#include <Viewer/FGEventHandler.hxx> #include <Viewer/FGEventHandler.hxx>
// Old versions of PUI are missing these defines
#ifndef PU_SCROLL_UP_BUTTON
#define PU_SCROLL_UP_BUTTON 3
#endif
#ifndef PU_SCROLL_DOWN_BUTTON
#define PU_SCROLL_DOWN_BUTTON 4
#endif
using namespace flightgear; using namespace flightgear;
class PUIDrawable : public osg::Drawable class PUIDrawable : public osg::Drawable

2
src/Viewer/renderer.cxx
View file

@ -116,7 +116,7 @@
#endif #endif
#if defined(HAVE_PUI) #if defined(HAVE_PUI)
#include <Viewer/puicamera.hxx> #include <Viewer/PUICamera.hxx>
#endif #endif
using namespace osg; using namespace osg;