Commit graph

136 commits

Author SHA1 Message Date
Dimitar Dobrev
f427f524bf Patched the Qt CMake function for auto-translations so that *.ts files
are not deleted on clean.
2014-03-12 01:24:31 +02:00
Dimitar Dobrev
e10dacdbfe Changed the searcning for qxmpp to include debug libraries as well. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
1c2e752f3c Integrated QXmpp in the build system. 2014-03-12 01:16:10 +02:00
Stephen Birarda
002738037c only look for the 32-bit oculus lib on windows 2014-03-10 09:28:20 -07:00
Stephen Birarda
4e382099fb have FindGLEW only look for 32-bit static lib 2014-03-10 09:27:32 -07:00
Stephen Birarda
6d5515a41d clarify that Windows builds are 32-bit, fix double GLEW_STATIC 2014-03-10 09:27:01 -07:00
ZappoMan
9c93149bd7 fix searching for sixense SDK on windows 2014-03-08 18:46:36 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00
Stephen Birarda
a72cac8c9c default to using Release LibOVR, include instructions for OS X rebuild 2014-03-07 14:31:59 -08:00
Stephen Birarda
03a9d6c02d glut dll search is for path, not library 2014-03-07 14:14:15 -08:00
Stephen Birarda
720846fa62 fix FindGLUT to get path to GLUT dll 2014-03-07 14:11:45 -08:00
Stephen Birarda
b8a03cf0f4 glew to be linked statically so dll not required at runtime 2014-03-07 14:08:30 -08:00
Stephen Birarda
1bd3529395 more module fixes and sixense readme change for OS X dylib 2014-03-07 13:59:50 -08:00
Stephen Birarda
569dd694fe cmake styling cleanup in Visage find module and interface CMakeLists 2014-03-07 13:42:13 -08:00
Stephen Birarda
23249866f7 have cmake copy dlls for glut and glew beside executable 2014-03-07 13:41:00 -08:00
Stephen Birarda
5452b81d58 use a path suffix in GLEW finder to get correct dir 2014-03-07 12:24:03 -08:00
Stephen Birarda
e3363dd304 conditionally include the OPENGL_INCLUDE_DIR since it is empty on windows 2014-03-07 12:22:58 -08:00
Stephen Birarda
01f155a103 use a PATH_SUFFIXES command in freeglut path find 2014-03-07 12:21:16 -08:00
Stephen Birarda
9db4b803c6 print out the GLUT include dir from GLUT find module 2014-03-07 12:18:39 -08:00
Stephen Birarda
1ec48b5999 fix a dumb elseif in custom find glut module 2014-03-07 12:16:09 -08:00
Stephen Birarda
a9c277312c don't mark useful variables as advanced 2014-03-07 12:11:46 -08:00
Stephen Birarda
dbf8021ccd include GLUT and OpenGL dirs as system includes 2014-03-07 12:07:19 -08:00
Stephen Birarda
20dd5d6e8d cmake file standardization in Sixense find module 2014-03-07 11:58:51 -08:00
Stephen Birarda
0ec0a87849 tweaks to GLEW and freeglut find modules 2014-03-07 11:57:20 -08:00
Stephen Birarda
bcaaa56b3d cleanup in GLUT find module 2014-03-07 11:51:35 -08:00
Stephen Birarda
3b9ae75162 make FindGLUT error if it is not found 2014-03-07 11:50:09 -08:00
Stephen Birarda
638d079c0c more module cleanup and simplification 2014-03-07 11:47:46 -08:00
Stephen Birarda
46e575838b simplify GLEW find module for Win32 2014-03-07 11:45:05 -08:00
Stephen Birarda
af18840c4e simplify GLUT find module for Win32 2014-03-07 11:41:40 -08:00
Stephen Birarda
30e0cbe639 fix arch dir for Win32 in GLEW module 2014-03-07 11:36:33 -08:00
Stephen Birarda
42addd4ed4 more GLUT module cleanup 2014-03-07 11:33:47 -08:00
Stephen Birarda
45ff1e4055 more cmake styling and module cleanup 2014-03-07 11:31:46 -08:00
Stephen Birarda
40bd46c782 cmake styling cleanup and glew module fixes 2014-03-07 11:21:36 -08:00
Stephen Birarda
8ba82649df pick the correct arch for GLEW on windows 2014-03-07 10:57:11 -08:00
Stephen Birarda
c3ebd83ae7 repair the glut find module to check include for header 2014-03-07 10:45:18 -08:00
Stephen Birarda
b56d995cf2 have the FindGLM module check HIFI_LIB_DIR 2014-03-07 10:42:21 -08:00
Stephen Birarda
3dc41bc19b fix the Sixense and LibOVR find modules 2014-03-07 10:20:19 -08:00
Stephen Birarda
aef15b86bf also look in HIFI_LIB_DIR for oculus lib 2014-03-07 10:03:16 -08:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
Stephen Birarda
0bf0edc0f0 look in {HIFI_LIB_DIR}/glm for glm on windows 2014-03-06 17:53:51 -08:00
Stephen Birarda
b91a55d89d tweak the GLEW and glut modules to be more hifi specific 2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84 add a find module for glew and tweak glm module 2014-03-06 17:41:14 -08:00
Stephen Birarda
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -08:00
Stephen Birarda
031c553a8d find LibOVR depending on architecure and build type on Linux and Win 2014-03-06 14:31:26 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Stephen Birarda
cade36356d some more string quoting in cmake files 2014-03-03 16:38:39 -08:00