From f5c10caf3f3ebd90a03984aeb6a4d924383d2acd Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 14 Dec 2015 22:04:23 +0100 Subject: [PATCH] LP-2 linux: specify architecture when setting QT_SPEC this is used later in copydata.pro files to copy appropriate files based on 32/64 architecture --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7184cfab2..04db0a97a 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,11 @@ include $(ROOT_DIR)/make/tools.mk # We almost need to consider autoconf/automake instead of this ifeq ($(UNAME), Linux) - QT_SPEC := linux-g++ + ifeq ($(ARCH), x86_64) + QT_SPEC := linux-g++-64 + else + QT_SPEC := linux-g++-32 + endif UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator else ifeq ($(UNAME), Darwin) QT_SPEC := macx-g++