Skip to content

Q
qgroundcontrol
Commit 8ce25540 authored by lm's avatar lm
Browse files
Options

Compile fixes

parents f1c6ebc1 881c874e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
qgroundcontrol.pri
View file @ 8ce25540
......@@ -135,7 +135,7 @@ macx {
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
#QMAKE_CXXFLAGS += -Wl, -E
#QMAKE_CXXFLAGS += -Wl,-E
}
# GNU/Linux
......@@ -204,7 +204,7 @@ linux-g++ {
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl, -E
QMAKE_CXXFLAGS += -Wl,-E
}
linux-g++-64 {
......@@ -268,7 +268,7 @@ linux-g++-64 {
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl, -E
QMAKE_CXXFLAGS += -Wl,-E
}
# Windows (32bit)
......@@ -339,7 +339,7 @@ win32-g++ {
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl, -E
QMAKE_CXXFLAGS += -Wl,-E
}
# Windows (64bit)
......@@ -377,5 +377,5 @@ win64-g++ {
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl, -E
QMAKE_CXXFLAGS += -Wl,-E
}
src/ui/map3D/GCManipulator.cc
View file @ 8ce25540
......@@ -254,7 +254,7 @@ GCManipulator::calcMovement()
if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
{
// rotate camera
osg::Vec3d axis;
osg::Vec3 axis;
float angle;
float px0 = _ga_t0->getXnormalized();
......
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