rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-380: Turn osgEarth on by default on Linux

Browse Source
This commit is contained in:
James Duley 2016-08-16 22:54:30 +01:00
parent d8cef1eb9c
commit a27548d062
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -11,7 +11,7 @@ before_install:
- make build_sdk_install - make build_sdk_install
script: script:
- make config_new CCACHE=ccache GCS_WITH_OSGEARTH=1 - make config_new CCACHE=ccache
- make all_flight - make all_flight
- make opfw_resource - make opfw_resource
- make gcs - make gcs

2
Makefile
View File

@ -129,7 +129,7 @@ include $(ROOT_DIR)/make/tools.mk
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
GCS_WITH_OSG := 1 GCS_WITH_OSG := 1
GCS_WITH_OSGEARTH := 0 GCS_WITH_OSGEARTH := 1
GCS_COPY_OSG := 0 GCS_COPY_OSG := 0
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator

1
bitbucket-pipelines.yml
View File

@ -6,7 +6,6 @@ pipelines:
- apt-get update -q - 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 - 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 build_sdk_install
- make config_new GCS_WITH_OSGEARTH=1
- make all_flight - make all_flight
- make opfw_resource - make opfw_resource
- make gcs - make gcs

2
package/linux/debian/rules
View File

@ -12,7 +12,7 @@ export DH_OPTIONS
dh $@ dh $@
override_dh_auto_configure: 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: override_dh_auto_build:
dh_auto_build -- opfw_resource gcs dh_auto_build -- opfw_resource gcs

3
package/linux/rpmspec.in
View File

@ -59,8 +59,7 @@ make config_new \
prefix=%{_prefix} \ prefix=%{_prefix} \
QMAKE=qmake-qt5 \ QMAKE=qmake-qt5 \
udevrulesdir=%{_udevrulesdir} \ udevrulesdir=%{_udevrulesdir} \
WITH_PREBUILT_FW=$(pwd)/build/firmware \ WITH_PREBUILT_FW=$(pwd)/build/firmware
GCS_WITH_OSGEARTH=1
make %{?_smp_mflags} opfw_resource gcs make %{?_smp_mflags} opfw_resource gcs