115 commits

Author	SHA1	Message	Date
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