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

LP-29 renamed OSG_DIR to OSG_PARENT_DIR as per review comment

Browse Source
This commit is contained in:
Philippe Renon 2015-08-31 10:38:12 +02:00
parent a7428ed9ad
commit 7a45978815
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/tools.mk
View File

@ -115,16 +115,16 @@ UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60
DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1 DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1
GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0 GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0
CCACHE_DIR := $(TOOLS_DIR)/ccache CCACHE_DIR := $(TOOLS_DIR)/ccache
OSG_DIR := $(TOOLS_DIR) OSG_PARENT_DIR := $(TOOLS_DIR)
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
OSG_SDK_DIR := $(OSG_DIR)/osg-3.4.0-rc5-linux-x64-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-linux-x64-qt-5.4.1
else else
OSG_SDK_DIR := $(OSG_DIR)/osg-3.4.0-rc5-linux-x86-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-linux-x86-qt-5.4.1
endif endif
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
OSG_SDK_DIR := $(OSG_DIR)/osg-3.4.0-rc5-clang_64-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-clang_64-qt-5.4.1
else ifeq ($(UNAME), Windows) else ifeq ($(UNAME), Windows)
MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH) MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)
# When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri # When changing PYTHON_DIR, you must also update it in ground/gcs/src/python.pri
@ -136,7 +136,7 @@ else ifeq ($(UNAME), Windows)
MESAWIN_DIR := $(TOOLS_DIR)/mesawin MESAWIN_DIR := $(TOOLS_DIR)/mesawin
CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86 CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86
MSYS_DIR := $(TOOLS_DIR)/msys MSYS_DIR := $(TOOLS_DIR)/msys
OSG_SDK_DIR := $(OSG_DIR)/osg-3.4.0-rc5-mingw491_32-qt-5.4.1 OSG_SDK_DIR := $(OSG_PARENT_DIR)/osg-3.4.0-rc5-mingw491_32-qt-5.4.1
endif endif
QT_SDK_PREFIX := $(QT_SDK_DIR) QT_SDK_PREFIX := $(QT_SDK_DIR)