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

Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into thread/OP-1222_FW_Wizard

Browse Source 
Conflicts:
	ground/openpilotgcs/src/python.pri
This commit is contained in:
m_thread 2014-08-25 23:57:54 +02:00
commit 1d43814c5a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/openpilotgcs/src/python.pri
View File

@ -1,7 +1,7 @@
# We use python to extract git version info and generate some other files, # We use python to extract git version info and generate some other files,
# but it may be installed locally. The expected python version should be # but it may be installed locally. The expected python version should be
# kept in sync with make/tools.mk. # kept in sync with make/tools.mk.
PYTHON_DIR = qt-5.3.1/Tools/mingw48_32/opt/bin PYTHON_DIR = qt-5.3.1/Tools/mingw482_32/opt/bin
ROOT_DIR = $$GCS_SOURCE_TREE/../.. ROOT_DIR = $$GCS_SOURCE_TREE/../..
@ -15,8 +15,12 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\" PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
} else { } else {
# not found, hope it's in the path... # not found, hope it's in the path...
!macx: { PYTHON = \"$$(PYTHON)\" } PYTHON_VER = "$$system(python --version 2>&1)"
macx: { PYTHON = \"python\" } contains(PYTHON_VER, "Python 2.*") {
PYTHON = \"python\"
} else {
PYTHON = \"python2\"
}
} }
} }