From 2a02c974bc14b8edb265bcb19dc5b3bfc8b6b9fa Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 19 Mar 2015 21:01:06 +0100 Subject: [PATCH] OP-1796 isolate windows specific variables in tools.mk (minor cleanup in preparation of the osgearth merge) --- make/tools.mk | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 1696130fa..2c946aadc 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -98,26 +98,23 @@ endif GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip -# When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri -# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri -ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_9-2014q4 -MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw491_32 -PYTHON_DIR := $(QT_SDK_DIR)/Tools/mingw491_32/opt/bin -NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode -SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 -OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32 -UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60 -DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1 -GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0 +ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_9-2014q4 QT_SDK_DIR := $(TOOLS_DIR)/qt-5.4.1 +UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60 +DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1 +GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0 -ifeq ($(UNAME), Windows) - MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH) - PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin - NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode - SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 - OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32 - MESAWIN_DIR := $(TOOLS_DIR)/mesawin +ifeq ($(UNAME), Linux) +else ifeq ($(UNAME), Darwin) +else ifeq ($(UNAME), Windows) + MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH) + # When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri + PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin + NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode + # When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri + SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 + OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32 + MESAWIN_DIR := $(TOOLS_DIR)/mesawin endif QT_SDK_PREFIX := $(QT_SDK_DIR)