Don't need to use libpng with Qt, require X11.
This commit is contained in:
parent
7d6fa7193f
commit
0b4d276138
1 changed files with 1 additions and 13 deletions
|
@ -20,18 +20,14 @@ class Qt < Formula
|
|||
]
|
||||
end
|
||||
|
||||
def self.x11?
|
||||
File.exist? "/usr/X11R6/lib"
|
||||
end
|
||||
|
||||
depends_on "d-bus" if ARGV.include? '--with-qtdbus'
|
||||
depends_on 'libpng' unless x11?
|
||||
depends_on 'sqlite' if MACOS_VERSION <= 10.5
|
||||
|
||||
def install
|
||||
ENV.append "CXXFLAGS", "-fvisibility=hidden"
|
||||
args = ["-prefix", prefix,
|
||||
"-system-libpng", "-system-zlib",
|
||||
"-L/usr/X11R6/lib", "-I/usr/X11R6/include",
|
||||
"-confirm-license", "-opensource",
|
||||
"-cocoa", "-fast" ]
|
||||
|
||||
|
@ -60,14 +56,6 @@ class Qt < Formula
|
|||
args << "-nomake" << "demos" << "-nomake" << "examples"
|
||||
end
|
||||
|
||||
if Qt.x11?
|
||||
args << "-L/usr/X11R6/lib"
|
||||
args << "-I/usr/X11R6/include"
|
||||
else
|
||||
args << "-L#{Formula.factory('libpng').lib}"
|
||||
args << "-I#{Formula.factory('libpng').include}"
|
||||
end
|
||||
|
||||
if MacOS.prefer_64_bit? or ARGV.include? '--universal'
|
||||
args << '-arch' << 'x86_64'
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue