Commit graph

444 commits

Author SHA1 Message Date
Seth Alves
24bb17f7b2 trying again to get polyvox to build on osx 2015-05-28 06:36:31 -07:00
Seth Alves
b024bd0ff2 trying again to get polyvox to build on osx 2015-05-27 22:00:20 -07:00
Seth Alves
6a1ea820e7 trying again to get polyvox to build on osx 2015-05-27 21:50:35 -07:00
Seth Alves
1026da18b2 trying again to get polyvox to build on osx 2015-05-27 21:32:20 -07:00
Seth Alves
5b62714ba4 trying again to get polyvox to build on osx 2015-05-27 21:09:48 -07:00
Seth Alves
5e79b03faf trying to get polyvox to build on osx 2015-05-27 20:55:16 -07:00
Seth Alves
f4b7a41006 trying to get polyvox to build on osx 2015-05-27 20:46:50 -07:00
Seth Alves
6711c64cc6 trying to get polyvox to build on osx 2015-05-27 20:20:37 -07:00
Seth Alves
00296faa51 trying to get polyvox to build on osx 2015-05-27 20:00:37 -07:00
Seth Alves
aff82a90ce try, try again 2015-05-27 19:16:50 -07:00
Seth Alves
05cd7fb8c4 update polyvox external source 2015-05-27 18:39:13 -07:00
Seth Alves
25df777132 fix polyfox url 2015-05-27 16:15:58 -07:00
Seth Alves
c933c42b18 move polyvox external source to s3 2015-05-27 15:02:20 -07:00
Seth Alves
1109444c3d attempt to make sure the ray that picks against polyvox entities is long enough 2015-05-27 14:57:12 -07:00
Brad Davis
810db39233 Working on oculus rendering 2015-05-27 12:42:05 -07:00
Seth Alves
7c4b89d917 get polyvox to build on osx 2015-05-27 11:56:57 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Seth Alves
6a3203475a Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:57:54 -07:00
Seth Alves
0c1ad258f3 update polyvox 2015-05-21 11:57:37 -07:00
Seth Alves
bd94d28075 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-21 11:55:17 -07:00
Seth Alves
8e76887101 working on windows build of polyvox 2015-05-21 11:55:13 -07:00
Seth Alves
b74262f2ce update polyvox 2015-05-21 11:53:56 -07:00
Seth Alves
c02b87ad1c update polyvox 2015-05-21 11:09:44 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Brad Davis
ba4ae3762d Working on merging in master 2015-04-30 22:01:03 -07:00
Stephen Birarda
b25d22aa53 use debug/release for IDE handling of V-HACD 2015-04-15 14:38:24 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master
use non-persistent settings to avoid lobby crash confusion
2015-04-02 17:37:24 +02:00
Bradley Austin Davis
4a7fd318c3 Fixing build problem on linux 2015-04-01 18:45:50 -07:00
Stephen Birarda
12cacad8f8 remove a stray message call in cmake file 2015-04-01 18:02:48 -07:00
Bradley Austin Davis
51d3aba71c Restoring SDK install target 2015-04-01 12:10:25 -07:00
Bradley Austin Davis
71233780e9 Pointing to an Oculus SDK build that works on linux (I hope) 2015-04-01 11:26:24 -07:00
Bradley Austin Davis
e3ae6354c4 Tie the Linux Oculus SDK to a given commit ID, so it can't invisibly break in the background in the repo is updted 2015-04-01 11:08:13 -07:00
Bradley Austin Davis
cebd2705c4 Updating windows Oculus SDK to 0.5.0.1 2015-04-01 11:06:22 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Stephen Birarda
f0c4aef932 download and make tbb for OS X 2015-03-30 17:26:33 -07:00
Stephen Birarda
a308eb2e2f don't use DX11 for bullet even if found 2015-03-30 16:44:10 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00
Stephen Birarda
eea4c56547 use TBB release libraries for apple external project 2015-03-26 14:03:25 -07:00
Stephen Birarda
faa47da57e update version of TBB external project 2015-03-24 11:49:33 -07:00
Brad Davis
7e50d6359e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-12 22:54:44 -07:00
Stephen Birarda
d3bc540919 use glm from hifi S3 now that fedora is down 2015-03-11 16:42:29 -07:00
Brad Davis
c512c5f2e9 LibOVR: Really fixing the Win32 build this time 2015-03-09 19:26:32 -07:00
Brad Davis
adb6a6ee54 Hopefully fixing win32 build 2015-03-09 17:27:10 -07:00
Brad Davis
2fdb92fc45 Fixing ubuntu build of libovr 2015-03-09 17:07:54 -07:00
Brad Davis
1e65324a7b Updating cmake config to build from pre-compiled Oculus SDK distribution 2015-03-09 14:46:43 -07:00
Brad Davis
e3d48dbb8f Working on Xcode build 2015-03-06 12:53:10 -08:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9 Merging from upstream 2015-03-04 21:53:31 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
95c25086d7 handle QTTOOLDIR env when looking for qmake 2015-02-26 16:59:37 -08:00
Stephen Birarda
eb646383e9 Revert "attempt to remove out-of-date warning for tbb"
This reverts commit 43da329eb4.
2015-02-26 16:21:15 -08:00
Stephen Birarda
43da329eb4 attempt to remove out-of-date warning for tbb 2015-02-26 16:14:09 -08:00
Stephen Birarda
9979bbd8b5 actually link debug bullet lib for WIN32 2015-02-26 15:49:03 -08:00
Stephen Birarda
5a4a3ce6dd remove message calls to debug bullet vars 2015-02-26 09:59:15 -08:00
Stephen Birarda
ea88518a44 handle debug/release for multi-config on WIN32 2015-02-26 09:57:56 -08:00
Stephen Birarda
621df1f66b remove win requirement of msbuild for bullet 2015-02-26 09:50:21 -08:00
Stephen Birarda
954a298dc4 correct QXmpp DLL path for windows 2015-02-23 13:04:12 -08:00
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
b32fa0f33d pass correct configuration to bullet install target 2015-02-23 12:27:30 -08:00
Stephen Birarda
88130feb11 force release build of bullet on win32 2015-02-23 12:19:54 -08:00
Stephen Birarda
8d97107acf use ALL_BUILD for bullet msbuild 2015-02-23 12:12:36 -08:00
Stephen Birarda
9e1a890ff2 fix for msbuild target command 2015-02-23 12:09:00 -08:00
Stephen Birarda
ded0b1461b help cmake find msbuild 2015-02-23 12:04:35 -08:00
Stephen Birarda
e60d91e4ce fix for bullet debug or release build on windows 2015-02-23 12:00:19 -08:00
Stephen Birarda
5983a94c7f force bullet cmake build to be RelWithDebInfo 2015-02-23 11:29:42 -08:00
Stephen Birarda
6803aa8d91 fix copy paste typos 2015-02-23 11:22:21 -08:00
Stephen Birarda
1372436e63 handle possibility that bullet builds debug libraries 2015-02-23 11:20:50 -08:00
Stephen Birarda
80da0a1702 use empty string for not present debug libraries 2015-02-23 11:11:35 -08:00
Stephen Birarda
353f7e2f96 set qxmpp debug library to empty string 2015-02-23 10:59:54 -08:00
Stephen Birarda
0990910ed2 add a missing period for apple qxmpp ext 2015-02-23 10:41:48 -08:00
Stephen Birarda
6042ba6cf2 fix for qxmpp name on win and lib location 2015-02-23 10:36:20 -08:00
Stephen Birarda
16c557a9c7 copy over /tmp/hifi.dst dir for xcode qxmpp install 2015-02-23 10:32:06 -08:00
Stephen Birarda
2463292339 link SDL2 as a downloaded framework on OS X 2015-02-23 10:00:44 -08:00
Stephen Birarda
e71a8258d6 fix SDL2 framework link on OS X 2015-02-23 09:52:35 -08:00
Stephen Birarda
82a798ef15 use SDL2 framework on OS X 2015-02-23 09:47:35 -08:00
Stephen Birarda
437d5c7bdf repairs to include locations for QXmpp and SDL2 2015-02-23 09:26:35 -08:00
Stephen Birarda
c3d98b1289 use nmake for install of QXmpp on windows 2015-02-23 09:11:52 -08:00
Stephen Birarda
1b8d421fb3 add a fatal error if nmake not found 2015-02-23 09:06:39 -08:00
Stephen Birarda
1c707059c5 fix for quoted PLATFORM_BUILD_COMMAND for QXmpp 2015-02-23 08:46:16 -08:00
Stephen Birarda
28bcc0a952 use nmake on win for QXmpp build 2015-02-23 08:43:18 -08:00
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
b23dd28b56 don't use static version of GLEW 2015-02-20 14:01:01 -08:00
Stephen Birarda
c242b4e834 set GLEW debug version to NOTFOUND 2015-02-20 13:55:40 -08:00
Stephen Birarda
ef729201d6 fix external name for GLEW 2015-02-20 13:51:12 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Stephen Birarda
a85cb2eeaa don't log glm install so it is shown in log 2015-02-20 12:18:14 -08:00
Stephen Birarda
abfebf51f5 handle install name change on OS X for TBB 2015-02-20 12:17:42 -08:00
Brad Davis
16feaceab5 Working on oculus build 2015-02-20 09:32:25 -08:00
Stephen Birarda
12f03c5606 set install name dir for bullet on OS X 2015-02-19 17:39:30 -08:00
Stephen Birarda
b7c03c34a8 use path and filepath where appropriate for cache 2015-02-19 16:39:05 -08:00
Stephen Birarda
dab524fb0f remove zlib modules and mentions in build guides 2015-02-19 15:35:40 -08:00
Stephen Birarda
63d4538b76 fix ZLIB dll find, bullet check 2015-02-19 15:22:37 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Stephen Birarda
a3d370f01f more path shortening for build of external projects 2015-02-19 14:33:31 -08:00
Stephen Birarda
d47a114f23 actually remove BUILD_SHARED_LIBS from combo command 2015-02-19 13:57:31 -08:00
Stephen Birarda
01c92ba94d don't attempt to build shared bullet libs on windows 2015-02-19 13:53:48 -08:00
Stephen Birarda
721be462f5 attempt to handle windows in bullet external project 2015-02-19 13:40:17 -08:00
Stephen Birarda
cbc6ae98d8 groundwork for windows support in bullet external project 2015-02-19 13:22:33 -08:00
Stephen Birarda
d185c775a4 fix install step for OS X bullet 2015-02-19 13:17:39 -08:00
Stephen Birarda
2cdb8edbbf fix casing for libBulletSoftBody 2015-02-19 12:44:49 -08:00
Stephen Birarda
03809131a4 log install to be able to confirm installed files 2015-02-19 12:39:48 -08:00
Stephen Birarda
d563c80ca0 handle bullet external project on unix/android 2015-02-19 12:12:41 -08:00
Stephen Birarda
70a89680f5 fix bullet include to match previous format 2015-02-19 12:04:41 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Stephen Birarda
27c6f80a61 use md5 hash to verify downloaded externals 2015-02-19 09:33:22 -08:00
Stephen Birarda
7ec01c9095 handle android build of tbb, don't prefix win with lib 2015-02-18 17:20:13 -08:00
Stephen Birarda
31b136f807 resolve conflicts on merge with upstream/master 2015-02-18 16:19:15 -08:00
Stephen Birarda
5a3ef34d1e use http link for gverb in case no git available 2015-02-18 16:14:51 -08:00
Stephen Birarda
75b193d784 mirror tbb in HF S3 for http link 2015-02-18 16:03:12 -08:00
Stephen Birarda
e665a1b4bb use https for tbb urls since it will redirect 2015-02-18 15:47:33 -08:00
Stephen Birarda
b3b292a45f handle linux binary find for tbb external project 2015-02-18 15:40:14 -08:00
Stephen Birarda
b6d660fdd3 setup TBB external project for windows 2015-02-18 15:26:33 -08:00
Stephen Birarda
973a076f34 use default prefix for external project 2015-02-18 13:54:39 -08:00
Stephen Birarda
60fc4d2c1c attempt to handle android via tbb binaries 2015-02-18 13:54:30 -08:00
Stephen Birarda
0a01a6f566 add TBB as external_project, handle on OS X 2015-02-18 13:24:59 -08:00
Stephen Birarda
d8bf8e322b fix a docstring in glm external project 2015-02-17 16:42:24 -08:00
Stephen Birarda
df72594afe fix for docstring of external projects 2015-02-17 16:41:16 -08:00
Stephen Birarda
801ab0e2b9 windows unhelpfully puts soxr dll in bin, not lib 2015-02-17 14:30:20 -08:00
Stephen Birarda
016ef2b243 fix name of soxr lib for windows 2015-02-17 12:36:26 -08:00
Stephen Birarda
66756308a4 force soxr to be shared lib, use new zip 2015-02-17 12:21:19 -08:00
Stephen Birarda
26b4340417 change soxr source to friendly zip 2015-02-17 12:07:57 -08:00
Stephen Birarda
c7befe8018 build the dynamic soxr to reduce manual linking 2015-02-17 11:56:33 -08:00
Stephen Birarda
c53465e550 fix archive type for soxr external project 2015-02-17 10:52:31 -08:00
Stephen Birarda
c82f5b7c0d use hifi-public as host for libsoxr 2015-02-17 10:50:43 -08:00
Stephen Birarda
2d1ad4977f handle soxr build for android 2015-02-17 10:46:19 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
9683ed92e3 use proper lib path on WIN32 for gverb 2015-02-13 16:40:48 -08:00
Stephen Birarda
018b8497bd use non-redirecting glm link to avoid https error 2015-02-13 16:21:19 -08:00
Stephen Birarda
28fabcb788 avoid ubuntu libssl error by using http links 2015-02-13 16:17:45 -08:00
Stephen Birarda
48e7aa7433 handle android build of gverb for external project 2015-02-13 16:06:30 -08:00
Stephen Birarda
4300836810 make gverb a cmake external project 2015-02-13 15:47:35 -08:00
Stephen Birarda
6e63c1c1ad set the GLM_INCLUDE_DIRS var in cache so find hits it 2015-02-13 14:50:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
50c9bb2ae5 remove glm as manual dep in BUILD guides 2015-02-13 12:33:29 -08:00
Stephen Birarda
2c7e225ef7 use cmake ExternalProject for glm in Interface 2015-02-13 10:14:47 -08:00