diff --git a/general.pri b/general.pri index 89889a6..9b062bc 100644 --- a/general.pri +++ b/general.pri @@ -8,9 +8,6 @@ RCC_DIR = ./res # compiler flags QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 -unix { - QMAKE_LFLAGS += "-Wl,--rpath=./" -} # prefix targetprefix = $$(TARGET_PREFIX) message("Using target prefix \"$${targetprefix}\".") diff --git a/passwordfile.pro b/passwordfile.pro index 105a827..473997e 100644 --- a/passwordfile.pro +++ b/passwordfile.pro @@ -1,5 +1,5 @@ projectname = passwordfile -VERSION = 2.0.5 +VERSION = 3.0.0 # include ../../common.pri when building as part of a subdirs project; otherwise include general.pri !include(../../common.pri) { @@ -10,9 +10,7 @@ VERSION = 2.0.5 TEMPLATE = lib CONFIG -= qt -win32 { - CONFIG += dll -} +CONFIG += shared # files SOURCES += aes/aes.cpp \ @@ -40,10 +38,11 @@ OTHER_FILES += \ # libs and includepath CONFIG(debug, debug|release) { - LIBS += -L../../ -lc++utilitiesd + LIBS += -lc++utilitiesd } else { - LIBS += -L../../ -lc++utilities + LIBS += -lc++utilities } +# TODO: remove build environment specific paths win32 { contains(QMAKE_TARGET.arch, x86_64):{ LIBS += -L../../../openssl-mingw_amd64/lib/ -lcrypto @@ -63,7 +62,6 @@ win32 { } } LIBS += -lz -INCLUDEPATH += ../ # installs mingw-w64-install {