mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-09 14:52:28 -04:00
CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.
CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
This commit is contained in:
parent
829c2f396e
commit
2be400e33e
4 changed files with 7 additions and 7 deletions
|
@ -1,10 +1,10 @@
|
|||
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
|
||||
|
||||
TEMPLATE = lib
|
||||
win32 {
|
||||
CONFIG += staticlib
|
||||
} else {
|
||||
macx {
|
||||
CONFIG = staticlib
|
||||
} else {
|
||||
CONFIG += staticlib
|
||||
}
|
||||
|
||||
DEFINES *= OPENSSL_NO_IDEA
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue