mirror of
https://github.com/lubosz/overte.git
synced 2025-08-07 19:41:20 +02:00
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
This commit is contained in:
Andrzej Kapolka
commit
78957e42be
2 changed files with 1 additions and 117 deletions
2
BUILD.md
2
BUILD.md
|
|
@ -55,7 +55,7 @@ Should you choose not to install Qt5 via a package manager that handles dependen
|
||||||
|
|
||||||
brew install cmake qt5 glm zlib
|
brew install cmake qt5 glm zlib
|
||||||
|
|
||||||
*High Fidelity has a [homebrew formula](https://raw.github.com/highfidelity/hifi/master/qt5.rb) for a patched version of Qt 5.2.0 stable that removes wireless network scanning that can reduce real-time audio performance. We recommended you use this formula to install Qt.*
|
*High Fidelity has a [homebrew formula](https://raw.github.com/highfidelity/homebrew-formulas/master/qt5.rb) for a patched version of Qt 5.2.0 stable that removes wireless network scanning that can reduce real-time audio performance. We recommended you use this formula to install Qt.*
|
||||||
#####Xcode
|
#####Xcode
|
||||||
If Xcode is your editor of choice, you can ask CMake to generate Xcode project files instead of Unix Makefiles.
|
If Xcode is your editor of choice, you can ask CMake to generate Xcode project files instead of Unix Makefiles.
|
||||||
|
|
||||||
|
|
|
||||||
116
qt5.rb
116
qt5.rb
|
|
@ -1,116 +0,0 @@
|
||||||
# this is a Qt5 formula patched to remove support for the CoreWLAN module on OS X
|
|
||||||
# which was causing us problems with constant WLAN scans
|
|
||||||
|
|
||||||
# the change is a removal of the following line in bearer.pro
|
|
||||||
# mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
|
|
||||||
|
|
||||||
require 'formula'
|
|
||||||
|
|
||||||
class Qt5HeadDownloadStrategy < GitDownloadStrategy
|
|
||||||
include FileUtils
|
|
||||||
|
|
||||||
def support_depth?
|
|
||||||
# We need to make a local clone so we can't use "--depth 1"
|
|
||||||
false
|
|
||||||
end
|
|
||||||
|
|
||||||
def stage
|
|
||||||
@clone.cd { reset }
|
|
||||||
safe_system 'git', 'clone', @clone, '.'
|
|
||||||
ln_s @clone, 'qt'
|
|
||||||
safe_system './init-repository', '--mirror', "#{Dir.pwd}/"
|
|
||||||
rm 'qt'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class Qt5 < Formula
|
|
||||||
homepage 'http://qt-project.org/'
|
|
||||||
url 'https://highfidelity-public.s3.amazonaws.com/packages/qt-everywhere-opensource-nocorewlan-src-5.2.0.tar.gz'
|
|
||||||
sha1 '07ef1ca133db4a5168d8a716e99d145432832a24'
|
|
||||||
head 'git://gitorious.org/qt/qt5.git', :branch => 'stable',
|
|
||||||
:using => Qt5HeadDownloadStrategy
|
|
||||||
|
|
||||||
keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)."
|
|
||||||
|
|
||||||
option :universal
|
|
||||||
option 'with-docs', 'Build documentation'
|
|
||||||
option 'developer', 'Build and link with developer options'
|
|
||||||
|
|
||||||
depends_on "d-bus" => :optional
|
|
||||||
depends_on "mysql" => :optional
|
|
||||||
|
|
||||||
odie 'qt5: --with-qtdbus has been renamed to --with-d-bus' if build.include? 'with-qtdbus'
|
|
||||||
odie 'qt5: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples'
|
|
||||||
odie 'qt5: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release'
|
|
||||||
|
|
||||||
def install
|
|
||||||
ENV.universal_binary if build.universal?
|
|
||||||
args = ["-prefix", prefix,
|
|
||||||
"-system-zlib",
|
|
||||||
"-confirm-license", "-opensource",
|
|
||||||
"-nomake", "examples",
|
|
||||||
"-release"]
|
|
||||||
|
|
||||||
unless MacOS::CLT.installed?
|
|
||||||
# ... too stupid to find CFNumber.h, so we give a hint:
|
|
||||||
ENV.append 'CXXFLAGS', "-I#{MacOS.sdk_path}/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
||||||
end
|
|
||||||
|
|
||||||
# https://bugreports.qt-project.org/browse/QTBUG-34382
|
|
||||||
args << "-no-xcb"
|
|
||||||
|
|
||||||
args << "-L#{MacOS::X11.lib}" << "-I#{MacOS::X11.include}" if MacOS::X11.installed?
|
|
||||||
|
|
||||||
args << "-plugin-sql-mysql" if build.with? 'mysql'
|
|
||||||
|
|
||||||
if build.with? 'd-bus'
|
|
||||||
dbus_opt = Formula.factory('d-bus').opt_prefix
|
|
||||||
args << "-I#{dbus_opt}/lib/dbus-1.0/include"
|
|
||||||
args << "-I#{dbus_opt}/include/dbus-1.0"
|
|
||||||
args << "-L#{dbus_opt}/lib"
|
|
||||||
args << "-ldbus-1"
|
|
||||||
end
|
|
||||||
|
|
||||||
if MacOS.prefer_64_bit? or build.universal?
|
|
||||||
args << '-arch' << 'x86_64'
|
|
||||||
end
|
|
||||||
|
|
||||||
if !MacOS.prefer_64_bit? or build.universal?
|
|
||||||
args << '-arch' << 'x86'
|
|
||||||
end
|
|
||||||
|
|
||||||
args << '-developer-build' if build.include? 'developer'
|
|
||||||
|
|
||||||
system "./configure", *args
|
|
||||||
system "make"
|
|
||||||
ENV.j1
|
|
||||||
system "make install"
|
|
||||||
|
|
||||||
# Some config scripts will only find Qt in a "Frameworks" folder
|
|
||||||
cd prefix do
|
|
||||||
ln_s lib, frameworks
|
|
||||||
end
|
|
||||||
|
|
||||||
# The pkg-config files installed suggest that headers can be found in the
|
|
||||||
# `include` directory. Make this so by creating symlinks from `include` to
|
|
||||||
# the Frameworks' Headers folders.
|
|
||||||
Pathname.glob(lib + '*.framework/Headers').each do |path|
|
|
||||||
framework_name = File.basename(File.dirname(path), '.framework')
|
|
||||||
ln_s path.realpath, include+framework_name
|
|
||||||
end
|
|
||||||
|
|
||||||
Pathname.glob(bin + '*.app').each do |path|
|
|
||||||
mv path, prefix
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test do
|
|
||||||
system "#{bin}/qmake", "-project"
|
|
||||||
end
|
|
||||||
|
|
||||||
def caveats; <<-EOS.undent
|
|
||||||
We agreed to the Qt opensource license for you.
|
|
||||||
If this is unacceptable you should uninstall.
|
|
||||||
EOS
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Loading…
Reference in a new issue