Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

phoenix.pro: with system quazip don't need -lz -lminizp or minizip.h #3240

Merged
merged 1 commit into from
Jun 19, 2016
Merged

phoenix.pro: with system quazip don't need -lz -lminizp or minizip.h #3240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
phoenix.pro: with system quazip don't need -lz -lminizp or minizip.h
  • Loading branch information
@cjmayo
cjmayo committed Jun 17, 2016
commit 9bcffaf26301a4bb6161a0c712ca481629cffce8
8 changes: 5 additions & 3 deletions phoenix.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ unix {
} else {
DEFINES += LINUX_32
}
LIBS += -lz
!contains(DEFINES, QUAZIP_INSTALLED) {
LIBS += -lz
}
}

isEmpty(PREFIX) {
Expand Down Expand Up @@ -244,8 +246,8 @@ include(pri/qtsysteminfo.pri)
include(pri/quazip.pri)
}
contains(DEFINES, QUAZIP_INSTALLED) {
INCLUDEPATH += /usr/include/quazip /usr/include/minizip
LIBS += -lquazip -lminizip
INCLUDEPATH += /usr/include/quazip
LIBS += -lquazip
}

TARGET = Fritzing
Expand Down