rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00
Code Issues Releases Activity

LP-380: default to using system qt and osg on Linux

Browse Source
This commit is contained in:
James Duley 2016-08-14 12:22:45 +01:00
parent 226f8c4c3d
commit 5a17e26cea
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -140,9 +140,12 @@ export UAVOBJGENERATOR
GCS_BUILD_CONF := release
# Set extra configuration
GCS_EXTRA_CONF += osg copy_osg
GCS_EXTRA_CONF += osg
ifeq ($(UNAME), Darwin)
GCS_EXTRA_CONF += copy_osg
endif
ifeq ($(UNAME), Windows)
GCS_EXTRA_CONF += osgearth
GCS_EXTRA_CONF += osgearth copy_osg
endif
##############################

3
make/tools.mk
View File

@ -165,7 +165,8 @@ endif
BUILD_SDK_TARGETS := arm_sdk
ifeq ($(UNAME), Windows)
BUILD_SDK_TARGETS += nsis mesawin
else
endif
ifeq ($(UNAME), Darwin)
BUILD_SDK_TARGETS += qt_sdk osg
endif
ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen