mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-28 06:24:10 +01:00
LP-380: Turn osgEarth on by default on Linux
This commit is contained in:
parent
d8cef1eb9c
commit
a27548d062
@ -11,7 +11,7 @@ before_install:
|
||||
- make build_sdk_install
|
||||
|
||||
script:
|
||||
- make config_new CCACHE=ccache GCS_WITH_OSGEARTH=1
|
||||
- make config_new CCACHE=ccache
|
||||
- make all_flight
|
||||
- make opfw_resource
|
||||
- make gcs
|
||||
|
2
Makefile
2
Makefile
@ -129,7 +129,7 @@ include $(ROOT_DIR)/make/tools.mk
|
||||
ifeq ($(UNAME), Linux)
|
||||
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
|
||||
GCS_WITH_OSG := 1
|
||||
GCS_WITH_OSGEARTH := 0
|
||||
GCS_WITH_OSGEARTH := 1
|
||||
GCS_COPY_OSG := 0
|
||||
else ifeq ($(UNAME), Darwin)
|
||||
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
|
||||
|
@ -6,7 +6,6 @@ pipelines:
|
||||
- apt-get update -q
|
||||
- apt-get install -y libc6-i386 libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev libosgearth-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools
|
||||
- make build_sdk_install
|
||||
- make config_new GCS_WITH_OSGEARTH=1
|
||||
- make all_flight
|
||||
- make opfw_resource
|
||||
- make gcs
|
||||
|
@ -12,7 +12,7 @@ export DH_OPTIONS
|
||||
dh $@
|
||||
|
||||
override_dh_auto_configure:
|
||||
$(MAKE) config_new GCS_WITH_OSGEARTH=1 WITH_PREBUILT_FW=$(CURDIR)/firmware
|
||||
$(MAKE) config_new WITH_PREBUILT_FW=$(CURDIR)/firmware
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build -- opfw_resource gcs
|
||||
|
@ -59,8 +59,7 @@ make config_new \
|
||||
prefix=%{_prefix} \
|
||||
QMAKE=qmake-qt5 \
|
||||
udevrulesdir=%{_udevrulesdir} \
|
||||
WITH_PREBUILT_FW=$(pwd)/build/firmware \
|
||||
GCS_WITH_OSGEARTH=1
|
||||
WITH_PREBUILT_FW=$(pwd)/build/firmware
|
||||
|
||||
make %{?_smp_mflags} opfw_resource gcs
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user