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

msys2: set MINGW_DIR to /mingw[32|64]

Browse Source 
PYTHON_DIR, OSG_SDK_DIR, etc., now point to MINGW_DIR
This commit is contained in:
Philippe Renon 2016-02-17 23:13:01 +01:00
parent ed0e879b7c
commit 736a5410a8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/tools.mk
View File

@ -144,9 +144,15 @@ else ifeq ($(UNAME), Darwin)
OSG_SDK_DIR := $(OSG_TOOLS_DIR)/osg-3.5.1-clang_64-qt-$(QT_VERSION)
OSGEARTH_SDK_DIR := $(OSG_TOOLS_DIR)/osgearth-2.7-clang_64-qt-$(QT_VERSION)
else ifeq ($(UNAME), Windows)
MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)
ifeq ($(ARCH), x86_64)
MINGW_DIR := /mingw64
else
MINGW_DIR := /mingw32
endif
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin
PYTHON_DIR := $(MINGW_DIR)/bin
OSG_SDK_DIR := $(MINGW_DIR)
OSGEARTH_SDK_DIR := $(MINGW_DIR)
NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode
MESAWIN_DIR := $(TOOLS_DIR)/mesawin
endif