updated project files

This commit is contained in:
Martchus 2015-08-26 21:12:09 +02:00
parent 083c6dadeb
commit 7750466d75
2 changed files with 5 additions and 10 deletions

View File

@ -8,9 +8,6 @@ RCC_DIR = ./res
# compiler flags # compiler flags
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
QMAKE_LFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11
unix {
QMAKE_LFLAGS += "-Wl,--rpath=./"
}
# prefix # prefix
targetprefix = $$(TARGET_PREFIX) targetprefix = $$(TARGET_PREFIX)
message("Using target prefix \"$${targetprefix}\".") message("Using target prefix \"$${targetprefix}\".")

View File

@ -1,5 +1,5 @@
projectname = passwordfile 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 when building as part of a subdirs project; otherwise include general.pri
!include(../../common.pri) { !include(../../common.pri) {
@ -10,9 +10,7 @@ VERSION = 2.0.5
TEMPLATE = lib TEMPLATE = lib
CONFIG -= qt CONFIG -= qt
win32 { CONFIG += shared
CONFIG += dll
}
# files # files
SOURCES += aes/aes.cpp \ SOURCES += aes/aes.cpp \
@ -40,10 +38,11 @@ OTHER_FILES += \
# libs and includepath # libs and includepath
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += -L../../ -lc++utilitiesd LIBS += -lc++utilitiesd
} else { } else {
LIBS += -L../../ -lc++utilities LIBS += -lc++utilities
} }
# TODO: remove build environment specific paths
win32 { win32 {
contains(QMAKE_TARGET.arch, x86_64):{ contains(QMAKE_TARGET.arch, x86_64):{
LIBS += -L../../../openssl-mingw_amd64/lib/ -lcrypto LIBS += -L../../../openssl-mingw_amd64/lib/ -lcrypto
@ -63,7 +62,6 @@ win32 {
} }
} }
LIBS += -lz LIBS += -lz
INCLUDEPATH += ../
# installs # installs
mingw-w64-install { mingw-w64-install {