From 7710f6d123ae1ec3a1afe36d9dcd25e9e16c1741 Mon Sep 17 00:00:00 2001 From: mantelt Date: Fri, 30 Jun 2017 14:51:33 +0200 Subject: [PATCH] ExternalLibs: Fix compiling on windows 64bit Add switch to QGCExternalLibs.pri to check whether 32bit or 64bit version of SDL should be used on windows --- QGCExternalLibs.pri | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 52e5de7fb..e25abb0a9 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -80,11 +80,14 @@ MacBuild { } else:LinuxBuild { PKGCONFIG = sdl2 } else:WindowsBuild { - INCLUDEPATH += \ - $$BASEDIR/libs/lib/sdl2/msvc/include \ + INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include + contains(QT_ARCH, i386) { + LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86 + } else { + LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64 + } LIBS += \ - -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86 \ -lSDL2main \ -lSDL2 } -- 2.22.0