diff --git a/ui/drivers/qt/wimp/wimp.pro b/ui/drivers/qt/wimp/wimp.pro index 69c9bfbc3f..fa24d3e448 100644 --- a/ui/drivers/qt/wimp/wimp.pro +++ b/ui/drivers/qt/wimp/wimp.pro @@ -18,10 +18,5 @@ HEADERS +=\ wimp.h \ wimp_global.h -unix { - target.path = /usr/lib - INSTALLS += target -} - RESOURCES += \ qml.qrc diff --git a/ui/drivers/qt/wrapper/wrapper.cpp b/ui/drivers/qt/wrapper/wrapper.cpp index 2dae2d2e2f..4e5cb2a9e7 100644 --- a/ui/drivers/qt/wrapper/wrapper.cpp +++ b/ui/drivers/qt/wrapper/wrapper.cpp @@ -1,5 +1,5 @@ -#include "../../wimp/wimp/wimp.h" -#include "../../wimp/wimp/wimp_global.h" +#include "../wimp/wimp.h" +#include "../wimp/wimp_global.h" #include "wrapper.h" diff --git a/ui/drivers/qt/wrapper/wrapper.pro b/ui/drivers/qt/wrapper/wrapper.pro index 6b3cd35689..d8b8b8c210 100644 --- a/ui/drivers/qt/wrapper/wrapper.pro +++ b/ui/drivers/qt/wrapper/wrapper.pro @@ -14,13 +14,7 @@ HEADERS += \ wrapper.h -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../wimp/build/release/ -lwimp -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../wimp/build/debug/ -lwimp +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../release -lwimp -INCLUDEPATH += $$PWD/../../wimp/build/debug -DEPENDPATH += $$PWD/../../wimp/build/debug - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../wimp/build/release/libwimp.dll.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../wimp/build/debug/libwimp.dll.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../wimp/build/release/wimp.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../wimp/build/debug/wimp.lib +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../release/libwimp.dll.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../release/wimp.lib