From 7e6d99005cb33ffa8094cabde9e80c2de7737792 Mon Sep 17 00:00:00 2001 From: Rustom Jehangir Date: Sat, 20 Aug 2016 14:20:28 -0700 Subject: [PATCH] SDL2: Change external libs to SDL2 --- QGCExternalLibs.pri | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 9e746de95..9a06576a9 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -169,21 +169,21 @@ contains(DEFINES, DISABLE_RTLAB) { # MacBuild { INCLUDEPATH += \ - $$BASEDIR/libs/lib/Frameworks/SDL.framework/Headers + $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers LIBS += \ -F$$BASEDIR/libs/lib/Frameworks \ -framework SDL } else:LinuxBuild { - PKGCONFIG = sdl + PKGCONFIG = sdl2 } else:WindowsBuild { INCLUDEPATH += \ - $$BASEDIR/libs/lib/sdl/msvc/include \ + $$BASEDIR/libs/lib/sdl2/msvc/include \ LIBS += \ - -L$$BASEDIR/libs/lib/sdl/msvc/lib \ - -lSDLmain \ - -lSDL + -L$$BASEDIR/libs/lib/sdl2/msvc/lib \ + -lSDL2main \ + -lSDL2 } ## -- 2.22.0