173 commits

Author	SHA1	Message	Date
Brad Davis	09085f1cd9	Working towards display plugins	2015-05-26 18:42:38 -07:00
Ryan Huffman	0883bde1be	Update compiler flags to produce warnings on non-gnu compilers	2015-05-01 11:29:23 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Brad Davis	7a33474245	Merge remote-tracking branch 'upstream/master' into offscreen ... Conflicts: interface/src/Menu.cpp	2015-04-21 13:02:38 -07:00
Stephen Birarda	03129f98d4	make VHACD an external project	2015-04-15 13:51:51 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
David Rowe	12f5b992c9	Add /LARGEADDRESSAWARE linker flag for Windows builds ... Enables Interface to use more than 2GB of memory. Reduces the incidence of bad_alloc crashes.	2015-04-08 20:01:01 -07:00
Bradley Austin Davis	db9ab3e699	Merge branch 'master' into oculus_old_renderer	2015-03-31 18:25:34 -07:00
Bradley Austin Davis	02b69f4a70	Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 13:32:13 -07:00
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	fd29f72bfe	Making nsight usage optional (still defaults to on)	2015-03-16 12:59:41 -07:00
Brad Davis	320cfa7c9e	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-09 14:54:09 -07:00
Andrew Meadows	e4c68bf31c	committing some temp debug stuff to help git diff ... (will remove this stuff later)	2015-03-05 18:06:08 -08:00
Brad Davis	c1c97fc8b6	Updating cmake files after merging from master	2015-03-04 23:32:27 -08:00
Stephen Birarda	e43da00537	remove xmpp chat support	2015-03-03 10:13:41 -08:00
Stephen Birarda	a7a9ede744	handle an SDK in Xcode beta	2015-02-25 13:53:57 -08:00
Stephen Birarda	e0d31f6e61	remove extra added spaces	2015-02-25 13:52:14 -08:00
Stephen Birarda	994c0386d3	cleanup command that looks for SDK	2015-02-25 13:50:59 -08:00
Stephen Birarda	d24287f627	look in Xcode application for 10.9 SDK	2015-02-25 13:48:28 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
Stephen Birarda	e7e7323ff0	pass 10.9 SDK as CMAKE_OSX_SYSROOT	2015-02-24 15:00:41 -08:00
Stephen Birarda	8be707f63f	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00
Stephen Birarda	2ad8ac866d	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
Stephen Birarda	c64f172311	add qxmpp as external project	2015-02-20 16:06:37 -08:00
Stephen Birarda	dc9c4ea43c	add options with default for get of external projects	2015-02-20 15:34:41 -08:00
Stephen Birarda	bc0bd462cb	add an external project for SDL 2	2015-02-20 15:26:16 -08:00
Stephen Birarda	a3d370f01f	more path shortening for build of external projects	2015-02-19 14:33:31 -08:00
Stephen Birarda	a0a4882ed6	shorten externals binary dir path	2015-02-19 14:18:05 -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	71482f6ad7	include tbb as system include, use project as prefix	2015-02-18 13:58:20 -08:00
Stephen Birarda	84e82f045d	find QT_DIR in root CMakeLists	2015-02-18 11:38:08 -08:00
Stephen Birarda	b2ecf99008	back out of lib cmake dir to get Qt bin	2015-02-18 11:36:49 -08:00
Stephen Birarda	e2d7fb574a	move macro call so it is actually loaded	2015-02-18 11:27:37 -08:00
Stephen Birarda	cc29297a19	remove requirement of Qt dlls in path	2015-02-18 10:13:23 -08:00
Stephen Birarda	c110fcbfad	merge with upstream/master	2015-02-17 17:34:48 -08:00
Seth Alves	8c7e147b82	include debug symbols	2015-02-17 15:16:03 -08:00
Stephen Birarda	bc899eaa58	add fixup_bundle step for WIN32 interface	2015-02-17 13:17:23 -08:00
Stephen Birarda	a5bd9be510	put externals in build-externals to avoid clean build removal	2015-02-17 11:00:23 -08:00
Stephen Birarda	2c7e225ef7	use cmake ExternalProject for glm in Interface	2015-02-13 10:14:47 -08:00
Stephen Birarda	ef9cc2aacc	repair ability for desktop to add gvr target	2015-02-12 12:49:29 -08:00
Stephen Birarda	53f58ad382	add possibility of desktop GVR build	2015-02-10 10:51:20 -08:00
Stephen Birarda	d68b0958a7	resolve conflicts on merge with upstream/master	2015-02-06 14:09:20 -08:00
Stephen Birarda	c8fb891158	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
Stephen Birarda	f3e120f45d	temp disable gvr-interface target to allow build	2015-02-04 11:15:03 -08:00
Stephen Birarda	1dd74c9831	allow gvr-interface target to be compiled for desktop	2015-01-28 16:57:16 -08:00
Stephen Birarda	d13e3c20c8	force GLM to not be found in path	2015-01-28 15:32:59 -08:00
Stephen Birarda	3dd0b85ca4	use a QOpenGLWidget subclass for InterfaceView	2015-01-28 15:26:03 -08:00
Stephen Birarda	2b0796eb7d	simplify cmake call for android build	2015-01-28 13:40:47 -08:00
Stephen Birarda	21ecaafea9	don't force system include of GLM	2015-01-22 11:38:34 -08:00