Commit graph

131 commits

Author SHA1 Message Date
Stephen Birarda
691cf2d893 remove gverb from win build guide 2015-02-13 16:12:47 -08:00
Stephen Birarda
50c9bb2ae5 remove glm as manual dep in BUILD guides 2015-02-13 12:33:29 -08:00
Stephen Birarda
f0f7bca5db don't force requirement of BOTH debug/release Bullet 2015-02-06 16:35:25 -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
98833e732d fix instructions for soxr on windows 2015-01-29 14:47:38 -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
0bf20a207c Added gverb instructions 2015-01-27 17:35:53 -08:00
Grayson Stebbins
dc1051b6a9 Reminder that everything should be 32-bit 2015-01-27 17:10:09 -08:00
Grayson Stebbins
baba56a793 Add another link back to BUILD.md 2015-01-27 15:34:54 -08:00
Grayson Stebbins
e6673327a2 Minor edits, addition of note about PATH 2015-01-27 14:37:22 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Grayson Stebbins
e290fa2e7f Small changes, removed VS section
Removed the Visual Studio section -- now that we have a better Visual Studio 2013 section it was unnecessary.
2015-01-27 13:42:24 -08:00
Grayson Stebbins
acb1494e3e Small edits to links 2015-01-27 13:38:58 -08:00
Grayson Stebbins
36e9f6b9e0 Reminder about all dependencies 2015-01-27 13:33:29 -08:00
Grayson Stebbins
1ce92c1939 added bullet to externals list 2015-01-27 11:45:26 -08:00
Grayson Stebbins
f085b81cde Add specifics on env variable setting location 2015-01-27 10:10:10 -08:00
Stephen Birarda
98a470aa35 add wording to windows for soxr guide 2015-01-23 14:02:43 -08:00
Stephen Birarda
1baef08ffd add instructions for soxr, clarify for tbb 2015-01-23 13:42:52 -08:00
Leonardo Murillo
a825f2a495 Markdown fix 2015-01-21 11:31:24 -06:00
Leonardo Murillo
93edd82038 Markdown fix 2015-01-21 11:28:50 -06:00
Leonardo Murillo
e82b07caf8 Updated Windows build instructions 2015-01-21 11:26:43 -06:00
Stephen Birarda
8455258fd4 update BUILD_WIN.md to support VS2013 Express 2015-01-15 09:44:02 -08:00
Stephen Birarda
e8ea45efde clarify TBB find for windows 2014-12-15 13:59:51 -08:00
Stephen Birarda
4d8d6d602a simplify the FindTBB module for set envs 2014-12-15 13:56:21 -08:00
Stephen Birarda
ea08d7bb23 remove block recommending VS2010 project file 2014-12-15 11:28:43 -08:00
Stephen Birarda
aac44953cb fix generator passed to cmake for windows build 2014-12-15 11:27:31 -08:00
Stephen Birarda
ee91964300 clarify that TBB can be installed wherever 2014-12-15 11:25:17 -08:00
Stephen Birarda
9b37967bed changes to instructions for TBB, remove MSVC2010 2014-12-15 11:23:25 -08:00
Stephen Birarda
bba48a61f9 cleanup formatting of build guides 2014-12-15 10:22:58 -08:00
Stephen Birarda
5ad4a57e3d add OS specific build files 2014-12-15 10:19:06 -08:00