rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

Merge branch 'revo-next' into corvuscorax/fix-baroaltitude-offset

Browse Source
This commit is contained in:
Corvus Corax 2012-05-31 17:24:30 +02:00
commit 8c4dc2be32
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -69,7 +69,7 @@ help:
@echo @echo
@echo " [Tool Installers]" @echo " [Tool Installers]"
@echo " qt_sdk_install - Install the QT v4.7.3 tools" @echo " qt_sdk_install - Install the QT v4.7.3 tools"
@echo " arm_sdk_install - Install the Code Sourcery ARM gcc toolchain" @echo " arm_sdk_install - Install the GNU ARM gcc toolchain"
@echo " openocd_install - Install the OpenOCD JTAG daemon" @echo " openocd_install - Install the OpenOCD JTAG daemon"
@echo " stm32flash_install - Install the stm32flash tool for unbricking boards" @echo " stm32flash_install - Install the stm32flash tool for unbricking boards"
@echo " dfuutil_install - Install the dfu-util tool for unbricking F4-based boards" @echo " dfuutil_install - Install the dfu-util tool for unbricking F4-based boards"
@ -189,10 +189,10 @@ qt_sdk_clean:
$(V1) [ ! -d "$(QT_SDK_DIR)" ] || $(RM) -rf $(QT_SDK_DIR) $(V1) [ ! -d "$(QT_SDK_DIR)" ] || $(RM) -rf $(QT_SDK_DIR)
# Set up ARM (STM32) SDK # Set up ARM (STM32) SDK
ARM_SDK_DIR := $(TOOLS_DIR)/arm-2011.03 ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_6-2012q1
.PHONY: arm_sdk_install .PHONY: arm_sdk_install
arm_sdk_install: ARM_SDK_URL := https://sourcery.mentor.com/sgpp/lite/arm/portal/package8736/public/arm-none-eabi/arm-2011.03-42-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 arm_sdk_install: ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.6/4.6-2012-q1-update/+download/gcc-arm-none-eabi-4_6-2012q1-20120316.tar.bz2
arm_sdk_install: ARM_SDK_FILE := $(notdir $(ARM_SDK_URL)) arm_sdk_install: ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
# order-only prereq on directory existance: # order-only prereq on directory existance:
arm_sdk_install: | $(DL_DIR) $(TOOLS_DIR) arm_sdk_install: | $(DL_DIR) $(TOOLS_DIR)

10
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -190,11 +190,11 @@ plugin_uavobjectutil.depends += plugin_uavobjects
SUBDIRS += plugin_uavobjectutil SUBDIRS += plugin_uavobjectutil
# OSG Earth View plugin # OSG Earth View plugin
plugin_osgearthview.subdir = osgearthview #plugin_osgearthview.subdir = osgearthview
plugin_osgearthview.depends = plugin_coreplugin #plugin_osgearthview.depends = plugin_coreplugin
plugin_osgearthview.depends += plugin_uavobjects #plugin_osgearthview.depends += plugin_uavobjects
plugin_osgearthview.depends += plugin_uavobjectwidgetutils #plugin_osgearthview.depends += plugin_uavobjectwidgetutils
SUBDIRS += plugin_osgearthview #SUBDIRS += plugin_osgearthview
# Magic Waypoint gadget # Magic Waypoint gadget
plugin_magicwaypoint.subdir = magicwaypoint plugin_magicwaypoint.subdir = magicwaypoint