Commit 49470ca0 authored by lm's avatar lm

Merging

parent e74faa37
...@@ -332,13 +332,13 @@ SOURCES += src/main.cc \ ...@@ -332,13 +332,13 @@ SOURCES += src/main.cc \
src/ui/map3D/ImageWindowGeode.cc src/ui/map3D/ImageWindowGeode.cc
contains(DEPENDENCIES_PRESENT, osg) { contains(DEPENDENCIES_PRESENT, osg) {
message("Including headers for OpenSceneGraph") message("Including sources for OpenSceneGraph")
# Enable only if OpenSceneGraph is available # Enable only if OpenSceneGraph is available
SOURCES += src/ui/map3D/Q3DWidget.cc SOURCES += src/ui/map3D/Q3DWidget.cc
contains(DEPENDENCIES_PRESENT, osgearth) { contains(DEPENDENCIES_PRESENT, osgearth) {
message("Including sources for OSGEARTH") message("Including sources for osgEarth")
# Enable only if OpenSceneGraph is available # Enable only if OpenSceneGraph is available
SOURCES += src/ui/map3D/QOSGWidget.cc \ SOURCES += src/ui/map3D/QOSGWidget.cc \
...@@ -352,7 +352,7 @@ contains(DEPENDENCIES_PRESENT, osgearth) { ...@@ -352,7 +352,7 @@ contains(DEPENDENCIES_PRESENT, osgearth) {
} }
contains(DEPENDENCIES_PRESENT, libfreenect) { contains(DEPENDENCIES_PRESENT, libfreenect) {
message("Including headers for libfreenect") message("Including sources for libfreenect")
# Enable only if libfreenect is available # Enable only if libfreenect is available
SOURCES += src/input/Freenect.cc SOURCES += src/input/Freenect.cc
......
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