Merge pull request #5373 from mantelt/fix/Win64_SDL_Lib

ExternalLibs: Fix compilation on windows 64bit

Merge pull request #5373 from mantelt/fix/Win64_SDL_Lib
ExternalLibs: Fix compilation on windows 64bit
63d4103d · Don Gagne · GitHub · 6dfa4da1 · 7710f6d1 · 63d4103d
Commit 63d4103d authored Jul 01, 2017 by Don Gagne Committed by GitHub Jul 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

QGCExternalLibs.pri QGCExternalLibs.pri +6 -3

No files found.
--- 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
 }