From 2343a697b392ab2c3f8723503620323e8c5294dd Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Sat, 26 Jul 2014 13:53:06 -0700 Subject: [PATCH] Limit libxbee support on Linux to 32-bit builds. Our included make file doesn't build for 64-bit. We actually need better selection on Windows and Linux platforms for building 32-bit or 64-bit versions. --- QGCExternalLibs.pri | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index e4f43ac64..9c9e1d82a 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -293,13 +293,15 @@ contains(DEFINES, DISABLE_XBEE) { } else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_XBEE) { message("Skipping support for native XBee API (manual override from user_config.pri)") } else:LinuxBuild { - exists(/usr/include/xbee.h) { + linux-g++-64 { + message("Skipping support for XBee API (64-bit Linux builds not supported)") + } else:exists(/usr/include/xbee.h) { message("Including support for XBee API") HEADERS += $$XBEE_DEPENDENT_HEADERS SOURCES += $$XBEE_DEPENDENT_SOURCES DEFINES += $$XBEE_DEFINES - LIBS += -lxbee + LIBS += -L/usr/lib -lxbee } else { warning("Skipping support for XBee API (missing libraries, see README)") } -- 2.22.0