Commit graph

72 commits

Author SHA1 Message Date
Stephen Birarda
9e5fb9532b clear up BUILD guide for optional external projects 2015-02-23 09:11:06 -08:00
Stephen Birarda
d6105e2e8c fix link to external project dependencies section 2015-02-20 14:20:44 -08:00
Stephen Birarda
175966cce8 clarify build guide for external projects 2015-02-20 14:19:08 -08:00
Stephen Birarda
afae7297e7 adjustements to build guides to remove bullet 2015-02-19 14:41:23 -08:00
Stephen Birarda
6231a9d8da remove TBB from build guides 2015-02-18 17:29:32 -08:00
Stephen Birarda
19cd24fb05 more clarification to BUILD guide for externals 2015-02-17 11:02:20 -08:00
Stephen Birarda
013bb0433c clarify build guide for sep externals build dir 2015-02-17 11:01:00 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
d337cadb10 add gverb to list of auto-deps 2015-02-13 16:12:03 -08:00
Stephen Birarda
9136154cd5 fix double subdir include, clear up build guide 2015-02-13 10:48:27 -08:00
Stephen Birarda
a9fe829bbe stay on Qt 5.3.2 on desktop for now 2015-02-06 10:39:26 -08:00
Stephen Birarda
2af54dcf95 update Qt requirement to 5.4 in BUILD 2015-01-29 11:52:34 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Grayson Stebbins
24845b7856 Added gverb 2015-01-27 17:34:00 -08:00
Grayson Stebbins
14f9d627f6 Note about Qxmpp version and support for Oculus Rift 2015-01-27 17:16:31 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Grayson Stebbins
a012562323 Correct bullet link, change order of build guides 2015-01-27 10:52:15 -08:00
Stephen Birarda
1baef08ffd add instructions for soxr, clarify for tbb 2015-01-23 13:42:52 -08:00
Stephen Birarda
35a69ce049 remove the faceplus find module 2015-01-07 09:48:12 -08:00
Andrew Meadows
cf235705da mention Bullet in BUILD.md dependencies 2015-01-05 15:29:02 -08:00
Stephen Birarda
c18c45a401 bump glm dependency version 2014-12-15 11:30:17 -08:00
Stephen Birarda
36f23fe4be fix Qt path in Generating build files 2014-12-15 11:26:06 -08:00
Stephen Birarda
a87fb0fe5e link to OS build guides from main guide 2014-12-15 10:21:31 -08:00
Stephen Birarda
5ad4a57e3d add OS specific build files 2014-12-15 10:19:06 -08:00
Stephen Birarda
d65f435e28 change Qt version referenced in build guide 2014-12-15 10:10:31 -08:00
Stephen Birarda
ce6334535b add info for TBB to Linux section 2014-12-15 10:08:48 -08:00
Stephen Birarda
a688f48bf7 indicate that user should run tbbvars for FindTBB 2014-12-15 10:02:01 -08:00
David Rowe
09eb150edc Update build instructions for VS2013 Community and Professional 2014-12-01 11:40:35 -08:00
Sleepy Daddy Software™
e7fe7bd021 Added the correct install order for VS2010 C++ Express and Windows 7.1 SDK. 2014-08-28 01:23:19 -04:00
Anthony Elliott
d4a6556917 Tweak build docs for Win 8.1 2014-07-28 19:52:00 -04:00
Stephen Birarda
f581c17c9e note that QXmpp is an optional dependency 2014-07-18 16:09:12 -07:00
Stephen Birarda
944e321944 fix a typo in Qt section 2014-07-18 16:06:34 -07:00
Stephen Birarda
b8bdb25313 move zLib to Linux and Windows specific sections 2014-07-18 16:06:10 -07:00
Stephen Birarda
880331de92 some typo cleanup in BUILD guide 2014-07-18 16:04:34 -07:00
Stephen Birarda
c8cfcaf4ad fix a poorly ordered link in devices section 2014-07-18 16:03:50 -07:00
Stephen Birarda
1cde11d3e5 more build guide clarifications 2014-07-18 16:02:58 -07:00
Stephen Birarda
f5d0241f1b clarify in BUILD guide that qxmpp is an optional dependency 2014-07-18 15:55:48 -07:00
Stephen Birarda
3c2ed95219 more cleanup to dependencies section of cmake 2014-07-17 11:56:23 -07:00
Stephen Birarda
c1987b6372 more tweaks to sections in BUILD guide 2014-07-17 11:54:01 -07:00
Stephen Birarda
aba4dcc5a8 fix min required OpenSSL version 2014-07-17 11:50:22 -07:00
Stephen Birarda
e9ab8899b2 some updates to the BUILD guide for OpenSSL 2014-07-17 11:49:37 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
Conflicts:
	interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
samcake
88888b0c39 Add reference to the external folder in BUILD.md
Add documentation to go look in the external devices folder for more
detail on how to support them
2014-07-09 16:03:30 -07:00
mpursley
f13c7634ad adding "export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.2.1/lib/cmake" for qt5.2.1 2014-07-07 01:08:11 -07:00
mpursley
d1cddb4f28 adding "export QT_CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake" for qt5.2.1 2014-07-07 01:02:04 -07:00
Stephen Birarda
146cd2b59d update BUILD.md to remove zlib requirement 2014-06-30 12:23:33 -07:00
Oren Hurvitz
32c97bb6a2 Update Windows build instructions 2014-06-18 10:52:02 +01:00
Stephen Birarda
55172c6f43 more cleanup to BUILD guide for windows 2014-04-14 12:39:45 -07:00
Stephen Birarda
d3776afc93 fix for DLL section in BUILD guide 2014-04-14 12:36:13 -07:00
Stephen Birarda
1aacba3b46 changes to Windows instructions for GnuTLS 2014-04-14 12:31:53 -07:00