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

OP-1818 added MSYS to toolchain (windows only) - needed to compile osg dependencies

Browse Source
This commit is contained in:
Philippe Renon 2015-04-05 18:38:15 +02:00
parent bc108eb542
commit 2c2d50908f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
make/tools.mk
View File

@ -118,6 +118,7 @@ else ifeq ($(UNAME), Windows)
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32
MESAWIN_DIR := $(TOOLS_DIR)/mesawin
CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86
MSYS_DIR := $(TOOLS_DIR)/msys
endif
QT_SDK_PREFIX := $(QT_SDK_DIR)
@ -921,6 +922,28 @@ endif
cmake_version:
-$(V1) $(ECHO) "`$(CMAKE) --version`"
##############################
#
# MSYS
#
##############################
ifeq ($(UNAME), Windows)
$(eval $(call TOOL_INSTALL_TEMPLATE,msys,$(MSYS_DIR),$(MSYS_URL),,$(notdir $(MSYS_URL))))
ifeq ($(shell [ -d "$(MSYS_DIR)" ] && $(ECHO) "exists"), exists)
export MSYS_DIR := $(MSYS_DIR)
else
# not installed, hope it's in the path...
#$(info $(EMPTY) WARNING $(call toprel, $(MSYS_DIR)) not found (make msys_install), using system PATH)
endif
.PHONY: msys_version
msys_version:
endif