rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

OP-1478 fix win qtc vairables: fixed TOOLS_DIR check

Browse Source
This commit is contained in:
James Duley 2014-09-13 16:37:30 +12:00
parent ea64284d7d
commit 17bb1d2fc0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/openpilotgcs.pri
View File

@ -73,8 +73,15 @@ isEmpty(GCS_BUILD_TREE) {
GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
} }
# Find the tools directory,
# try from Makefile (not run by Qt Creator),
TOOLS_DIR = $$(TOOLS_DIR)
isEmpty(TOOLS_DIR) {
# check for custom enviroment variable,
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR) TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
# fallback to default location.
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools) isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
}
SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15 SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15