Browse Source

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.
QGC4.4
Bryant Mairs 11 years ago
parent
commit
2343a697b3
  1. 6
      QGCExternalLibs.pri

6
QGCExternalLibs.pri

@ -293,13 +293,15 @@ contains(DEFINES, DISABLE_XBEE) {
} else:exists(user_config.pri):infile(user_config.pri, 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)") message("Skipping support for native XBee API (manual override from user_config.pri)")
} else:LinuxBuild { } 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") message("Including support for XBee API")
HEADERS += $$XBEE_DEPENDENT_HEADERS HEADERS += $$XBEE_DEPENDENT_HEADERS
SOURCES += $$XBEE_DEPENDENT_SOURCES SOURCES += $$XBEE_DEPENDENT_SOURCES
DEFINES += $$XBEE_DEFINES DEFINES += $$XBEE_DEFINES
LIBS += -lxbee LIBS += -L/usr/lib -lxbee
} else { } else {
warning("Skipping support for XBee API (missing libraries, see README)") warning("Skipping support for XBee API (missing libraries, see README)")
} }

Loading…
Cancel
Save