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

LP-30 fixed PATH issue on windows after switching to git for windows 2.6.2

Browse Source 
apparently environment variables, like TOOLS_DIR, set in .bashrc are messed up now (/d/path becomes D:/path)
a workaround is to set them in the Makefile config file
This commit is contained in:
Philippe Renon 2015-11-02 23:59:11 +01:00
parent 73d15be2c1
commit a3a7d55176
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/3rdparty/osgearth/osgearth.mk vendored
View File

@ -116,7 +116,7 @@ else ifeq ($(UNAME), Windows)
OSG_NAME := $(OSG_BASE_NAME)-$(QT_SDK_ARCH) OSG_NAME := $(OSG_BASE_NAME)-$(QT_SDK_ARCH)
OSG_CMAKE_GENERATOR := "MinGW Makefiles" OSG_CMAKE_GENERATOR := "MinGW Makefiles"
# CMake is quite picky about its PATH and will complain if sh.exe is found in it # CMake is quite picky about its PATH and will complain if sh.exe is found in it
OSG_BUILD_PATH := "$(TOOLS_DIR)/bin;$(QT_SDK_PREFIX)/bin;$(MINGW_DIR)/bin" OSG_BUILD_PATH := $(MINGW_DIR)/bin:$(QT_SDK_PREFIX)/bin
endif endif
OSG_NAME := $(OSG_NAME_PREFIX)$(OSG_NAME)$(OSG_NAME_SUFIX) OSG_NAME := $(OSG_NAME_PREFIX)$(OSG_NAME)$(OSG_NAME_SUFIX)
@ -240,7 +240,7 @@ else ifeq ($(UNAME), Windows)
OSGEARTH_NAME := $(OSGEARTH_BASE_NAME)-$(QT_SDK_ARCH) OSGEARTH_NAME := $(OSGEARTH_BASE_NAME)-$(QT_SDK_ARCH)
OSGEARTH_CMAKE_GENERATOR := "MinGW Makefiles" OSGEARTH_CMAKE_GENERATOR := "MinGW Makefiles"
# CMake is quite picky about its PATH and will complain if sh.exe is found in it # CMake is quite picky about its PATH and will complain if sh.exe is found in it
OSGEARTH_BUILD_PATH := "$(TOOLS_DIR)/bin;$(QT_SDK_PREFIX)/bin;$(MINGW_DIR)/bin;$(OSG_INSTALL_DIR)/bin" OSGEARTH_BUILD_PATH := $(MINGW_DIR)/bin:$(QT_SDK_PREFIX)/bin:$(OSG_INSTALL_DIR)/bin
OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib OSGEARTH_LIB_PATH := $(OSG_INSTALL_DIR)/lib
endif endif