From a3a7d551769369f03308d2605683b8153e0a0519 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 2 Nov 2015 23:59:11 +0100 Subject: [PATCH] LP-30 fixed PATH issue on windows after switching to git for windows 2.6.2 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 --- make/3rdparty/osgearth/osgearth.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/3rdparty/osgearth/osgearth.mk b/make/3rdparty/osgearth/osgearth.mk index 8553a8f93..eecff9bb1 100644 --- a/make/3rdparty/osgearth/osgearth.mk +++ b/make/3rdparty/osgearth/osgearth.mk @@ -116,7 +116,7 @@ else ifeq ($(UNAME), Windows) OSG_NAME := $(OSG_BASE_NAME)-$(QT_SDK_ARCH) OSG_CMAKE_GENERATOR := "MinGW Makefiles" # 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 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_CMAKE_GENERATOR := "MinGW Makefiles" # 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 endif