583 commits

Author	SHA1	Message	Date
Bradley Austin Davis	1d56266044	Merge branch 'master' into oculus_old_renderer	2015-03-20 09:56:54 -07:00
Brad Davis	54f2774d2e	Organize projects into folders for IDEs that support it	2015-03-19 15:45:11 -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	961173ede6	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-10 19:45:25 -07:00
Stephen Birarda	76f3378223	don't pass no-libraries option to windeployqt	2015-03-10 18:05:10 -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
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Stephen Birarda	e43da00537	remove xmpp chat support	2015-03-03 10:13:41 -08:00
Stephen Birarda	5a601f3676	resolve conflicts on merge with upstream/master	2015-03-03 10:01:24 -08:00
Stephen Birarda	38f77190eb	remove PrioVR from build files	2015-02-26 17:20:45 -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
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -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
Virendra Singh	b3fdb19cad	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 ... Conflicts: BUILD.md BUILD_WIN.md	2015-02-26 22:16:35 +05:30
Stephen Birarda	f8627c8233	fix handling for vc12 externals	2015-02-25 17:48:26 -08:00
Stephen Birarda	1c2606c6db	fail out if windeployqt is not found	2015-02-25 13:12:37 -08:00
Stephen Birarda	33b0fd24a6	don't call copy dll step for scribe	2015-02-25 11:02:05 -08:00
Stephen Birarda	66ab2ba9f9	fix for flipped conditional for dll fixup	2015-02-25 10:44:02 -08:00
Stephen Birarda	fd8240669b	fix for windeployqt for executables	2015-02-25 10:39:44 -08:00
Virendra Singh	ed09b619d1	OS check ... check OS for different filenames	2015-02-25 09:12:19 +05:30
Kodey	a5aeb3b980	cmake changes for building on linux	2015-02-25 08:45:00 +05:30
Stephen Birarda	d52ba5e958	call windeployqt after fixup_bundle for qt plugins	2015-02-24 13:20:17 -08:00
Stephen Birarda	71dd443ae2	also call fixup_bundle for release builds on win	2015-02-23 15:29:43 -08:00
Stephen Birarda	87ce55cc42	add new macro file for fixup libs	2015-02-23 13:24:53 -08:00
Stephen Birarda	8be707f63f	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00
Stephen Birarda	bae5d987f9	add OpenSSL lib path to paths for fixup	2015-02-23 13:21:45 -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