146 commits

Author	SHA1	Message	Date
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
Stephen Birarda	e5accde70d	set the qmake excutable path to tell Qt modules where to look	2015-01-22 11:11:22 -08:00
Stephen Birarda	64aa203825	add output of QT_CMAKE_PREFIX_PATH	2015-01-22 11:05:48 -08:00
Stephen Birarda	316bbce83c	allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt location	2015-01-22 11:04:04 -08:00
Stephen Birarda	5716f576b7	output archive to current binary dir	2015-01-21 13:30:28 -08:00
Stephen Birarda	a3529e745b	fix warning and compile with Multimedia	2015-01-21 13:28:18 -08:00
Stephen Birarda	c844502b97	use Qt 5.3 for android build as well	2015-01-19 14:49:01 -08:00
Stephen Birarda	de065ff442	add more instructions for Qt and GLM	2015-01-19 10:58:57 -08:00
Stephen Birarda	14e4879154	add a BUILD_ANDROID guide, reference ANDROID_LIB_DIR	2015-01-19 10:53:17 -08:00
Stephen Birarda	10be0ee984	resolve conflicts on merge with upstream master	2015-01-19 10:26:56 -08:00
Stephen Birarda	30f898109d	don't warn about c++11 for MSVC12	2015-01-13 09:40:55 -08:00
Stephen Birarda	d30490c760	resolve conflicts on merge with upstream master	2015-01-12 09:25:37 -08:00
Stephen Birarda	6beaa3d59a	set policy for shared lib creation on OS X	2014-12-18 14:36:15 -08:00
Stephen Birarda	a3cc578fd1	use libc++ for C++11 in APPLE builds	2014-12-15 14:08:23 -08:00
Stephen Birarda	5c3e90f64f	resolve conflicts on merge with upstream master	2014-12-03 13:11:56 -08:00
ZappoMan	3d082160ec	fix build buster	2014-11-20 09:42:11 -08:00
Stephen Birarda	998457665f	add back c++11 support to all, fix includes in networking	2014-11-18 17:26:42 -08:00
Stephen Birarda	5c9c89826e	only enable C++11 on android	2014-11-18 12:01:06 -08:00
Stephen Birarda	52750f1ec5	use PixelLight's original Apk.cmake for shared library support	2014-11-17 12:42:53 -08:00
Stephen Birarda	05cab9a3ba	add a gvr-interface target that uses native glue to make apk	2014-11-17 10:58:12 -08:00
Stephen Birarda	f23b08971c	merge with cuckoo branch, fix makefile OS X support	2014-11-14 10:52:12 -08:00
Stephen Birarda	424aceadb8	compile tools on android for mtc	2014-11-14 10:18:09 -08:00
Stephen Birarda	36a6344c36	include C++11 check for android support	2014-11-14 10:12:54 -08:00
Stephen Birarda	40dc3c517f	changes for android to find GLM and OpenSSL	2014-11-13 17:14:53 -08:00
Stephen Birarda	63304210c1	allow sep specification of android Qt location on system	2014-11-13 15:35:19 -08:00
Stephen Birarda	c8aeab53ba	changes for C++11 support	2014-11-05 11:42:18 -08:00
Sam Gateau	843a64eeee	Check for msdev version and appropriate window sdk	2014-10-16 16:15:01 -07:00
Stephen Birarda	ae90b38172	add the ice server	2014-10-01 17:19:34 -07:00