mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
OP-423: revert gcc and QT to version used by everybody for now until the new gcc works on MAC.
This commit is contained in:
parent
fbf0b021c7
commit
d91ad178af
8
Makefile
8
Makefile
@ -160,10 +160,10 @@ $(BUILD_DIR):
|
|||||||
###############################################################
|
###############################################################
|
||||||
|
|
||||||
# Set up QT toolchain
|
# Set up QT toolchain
|
||||||
QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-2010.05
|
QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-2010.02
|
||||||
|
|
||||||
.PHONY: qt_sdk_install
|
.PHONY: qt_sdk_install
|
||||||
qt_sdk_install: QT_SDK_URL := http://get.qt.nokia.com/qtsdk/qt-sdk-linux-x86-opensource-2010.05.bin
|
qt_sdk_install: QT_SDK_URL := http://get.qt.nokia.com/qtsdk/qt-sdk-linux-x86-opensource-2010.02.bin
|
||||||
qt_sdk_install: QT_SDK_FILE := $(notdir $(QT_SDK_URL))
|
qt_sdk_install: QT_SDK_FILE := $(notdir $(QT_SDK_URL))
|
||||||
# order-only prereq on directory existance:
|
# order-only prereq on directory existance:
|
||||||
qt_sdk_install : | $(DL_DIR) $(TOOLS_DIR)
|
qt_sdk_install : | $(DL_DIR) $(TOOLS_DIR)
|
||||||
@ -180,10 +180,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)/arm-2009q3
|
||||||
|
|
||||||
.PHONY: arm_sdk_install
|
.PHONY: arm_sdk_install
|
||||||
arm_sdk_install: ARM_SDK_URL := http://www.codesourcery.com/sgpp/lite/arm/portal/package5353/public/arm-none-eabi/arm-2011.03-42-arm-none-eabi-i686-pc-linux-gnu.tar.bz2
|
arm_sdk_install: ARM_SDK_URL := http://www.codesourcery.com/sgpp/lite/arm/portal/package5353/public/arm-none-eabi/arm-2009q3-68-arm-none-eabi-i686-pc-linux-gnu.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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user