diff options
| author | tezeb <tezeb+github@outoftheblue.pl> | 2017-10-24 00:50:08 +0200 |
|---|---|---|
| committer | tezeb <tezeb+github@outoftheblue.pl> | 2017-10-24 02:04:30 +0200 |
| commit | 378868f739e64ccf1d3ff7d27e480fd7f6bc648d (patch) | |
| tree | cfdf54e35245a1e8a34162da981e4df55baa8bc2 | |
| parent | 9157e8248a112503e23bb1edbe2ffa6366d54e0f (diff) | |
fix library path for Windows build
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | main/main.pro | 2 | ||||
| -rw-r--r-- | tests/auto/util/util.pro | 3 |
3 files changed, 3 insertions, 3 deletions
@@ -16,3 +16,4 @@ moc_*.cpp qrc_*.cpp ui_*.h localization/*.qm +build/ diff --git a/main/main.pro b/main/main.pro index 8344b0b7..e6480c94 100644 --- a/main/main.pro +++ b/main/main.pro @@ -4,7 +4,7 @@ TEMPLATE = app QT += core gui CONFIG += c++11 -LIBS += -L../src/ -lqtpass +LIBS = -L"$$OUT_PWD/../src/$(OBJECTS_DIR)" -lqtpass $$LIBS INCLUDEPATH += ../src macx { diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 150aa141..4f88ed0e 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -4,7 +4,7 @@ message($$QMAKE_LINK_OBJECT_MAX) SOURCES += tst_util.cpp \ -LIBS += -L../../../src -lqtpass +LIBS = -L"$$OUT_PWD/../../../src/$(OBJECTS_DIR)" -lqtpass $$LIBS HEADERS += util.h \ qtpasssettings.h \ @@ -21,7 +21,6 @@ VPATH += ../../../src INCLUDEPATH += ../../../src win32 { - LIBS += -lbcrypt RC_FILE = ../../../windows.rc # temporary workaround for QTBUG-6453 QMAKE_LINK_OBJECT_MAX=24 |