Andrzej Kapolka
|
853bba27ca
|
Applied Ryan's tweaks to Visage mapping and config file.
|
2014-03-10 15:13:24 -07:00 |
|
Andrzej Kapolka
|
de8165c544
|
Merge pull request #2253 from ey6es/master
Initialize scale to unity. Closes #2232.
|
2014-03-10 10:54:07 -07:00 |
|
Andrzej Kapolka
|
c6655382d6
|
Initialize scale to unity. Closes #2232.
|
2014-03-10 10:52:46 -07:00 |
|
Stephen Birarda
|
f099616aff
|
Merge pull request #2246 from ZappoMan/bugfixes
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
|
2014-03-10 09:29:51 -07:00 |
|
ZappoMan
|
e2415642f0
|
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
|
2014-03-09 00:10:31 -08:00 |
|
Brad Hefta-Gaub
|
4fbb4b240e
|
Merge pull request #2244 from ZappoMan/fix_cmake_policy_warning
windows build fixes - mostly cmake problems
|
2014-03-08 20:07:51 -08:00 |
|
ZappoMan
|
9c93149bd7
|
fix searching for sixense SDK on windows
|
2014-03-08 18:46:36 -08:00 |
|
Brad Hefta-Gaub
|
fe4b2494b8
|
Merge branch 'master' of git://github.com/worklist/hifi into fix_cmake_policy_warning
|
2014-03-08 18:29:43 -08:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Brad Hefta-Gaub
|
e0cbecc3dd
|
Merge pull request #2243 from ZappoMan/fix_cmake_policy_warning
fix cmake policy warnings
|
2014-03-08 17:57:55 -08:00 |
|
ZappoMan
|
35a1bb8744
|
fix cmake policy warnings
|
2014-03-08 17:26:38 -08:00 |
|
ZappoMan
|
b98dfd82c9
|
Merge pull request #2237 from birarda/master
remove svo-viewer to place in external repository
|
2014-03-08 16:01:04 -08:00 |
|
Stephen Birarda
|
e52bc2c667
|
remove svo-viewer to place in external repository
|
2014-03-07 16:31:01 -08:00 |
|
ZappoMan
|
68c3e0e54d
|
Merge pull request #2236 from Atlante45/fst_upload
FST ploader base
|
2014-03-07 15:42:52 -08:00 |
|
Leonardo Murillo
|
7b587a40e4
|
Merge pull request #2233 from birarda/cleanup-externals
make freeglut and glew external dependencies
|
2014-03-07 17:18:00 -06:00 |
|
Stephen Birarda
|
3eace31dde
|
add a definition so that static GLEW works without DLL
|
2014-03-07 14:53:13 -08:00 |
|
Stephen Birarda
|
386d0b8c41
|
add instructions to put Freeglut DLL into path
|
2014-03-07 14:51:55 -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
|
ec450315cd
|
remove an extra apostrophe in the BUILD guide
|
2014-03-07 14:36:39 -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
|
e96e88b3b3
|
remove a warning that no longer needs to be heeded
|
2014-03-07 14:19:45 -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 |
|
Atlante45
|
8faaa28bc1
|
FST ploader base
|
2014-03-07 11:55:02 -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 |
|