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
|
dceddc8ac4
|
repair indentation in root CMakeLists
|
2014-03-07 11:12:53 -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
|
cabbfb9a9e
|
fix typos in updated sixense and oculus READMEs
|
2014-03-07 10:36:19 -08:00 |
|
Stephen Birarda
|
68c5d72a0f
|
update sixense and oculus readme to suggest use of HIFI_LIB_DIR
|
2014-03-07 10:30:43 -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 |
|
Andrew Meadows
|
9d2758ee14
|
fix warning about malformed case statement
|
2014-03-07 09:32:12 -08:00 |
|
ZappoMan
|
92d39b3c47
|
Merge pull request #2229 from birarda/master
make LibOVR (for oculus) an external dependency
|
2014-03-06 22:43:32 -08:00 |
|
ZappoMan
|
dcff3b95a2
|
Merge pull request #2231 from ey6es/joints
Send joint rotations in avatar packets, allow scripts to get/set them.
|
2014-03-06 20:16:15 -08:00 |
|
Andrzej Kapolka
|
44374732fa
|
Further joint bits.
|
2014-03-06 19:30:24 -08:00 |
|
Stephen Birarda
|
52d90f7efa
|
clarify the glm note
|
2014-03-06 18:04:59 -08:00 |
|
Stephen Birarda
|
231dd9cf99
|
clarifications for the root_lib_dir for windows build
|
2014-03-06 18:04:19 -08:00 |
|
Stephen Birarda
|
2bbf08c746
|
add information to setup external libs on windows
|
2014-03-06 18:02:46 -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
|
cfc55c0435
|
cleanup interface CMakeLists for freeglut and GLEW finding
|
2014-03-06 17:23:56 -08:00 |
|
Stephen Birarda
|
d64be26e41
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals
|
2014-03-06 17:12:08 -08:00 |
|
Stephen Birarda
|
0f5fbb5fab
|
pull out glew and freeglut so they can be external dependencies
|
2014-03-06 17:09:59 -08:00 |
|
Andrzej Kapolka
|
c5ab32235f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into joints
|
2014-03-06 17:09:24 -08:00 |
|
Andrzej Kapolka
|
3adea84b81
|
Basic joint data sending. Closes #2166.
|
2014-03-06 17:07:29 -08:00 |
|
ZappoMan
|
c81bac2ac4
|
Merge pull request #2224 from birarda/resources
cleanup switchToResourcesParentIfRequired hack
|
2014-03-06 16:51:31 -08:00 |
|
Stephen Birarda
|
d51deca0fe
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-06 16:45:41 -08:00 |
|
Stephen Birarda
|
1ef780c6cb
|
make headers coding standard compliant
|
2014-03-06 16:24:58 -08:00 |
|
Stephen Birarda
|
0f22168e42
|
Merge pull request #2230 from ey6es/master
Add a five second download timeout timer: if that much time passes witho...
|
2014-03-06 16:22:54 -08:00 |
|
Stephen Birarda
|
7ef882c525
|
make sure InterfaceConfig is included before Qt headers
|
2014-03-06 16:14:18 -08:00 |
|
Stephen Birarda
|
8cbdf5d94a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into resources
|
2014-03-06 15:49:45 -08:00 |
|
Stephen Birarda
|
ac66f09157
|
Merge pull request #2194 from AndrewMeadows/cleanup
g++ warnings
|
2014-03-06 15:49:22 -08:00 |
|
Stephen Birarda
|
c2faf86201
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-06 15:24:37 -08:00 |
|
Stephen Birarda
|
4a1cb63d7b
|
remove an blank line in Application headers
|
2014-03-06 15:09:35 -08:00 |
|