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
|
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 |
|
Andrzej Kapolka
|
1d7f1afa5b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
|
2014-02-17 21:48:21 -08:00 |
|
Andrzej Kapolka
|
8206f8d2b3
|
Fixes for Windows. Compiles, but the license doesn't work yet.
|
2014-02-11 19:00:41 -08:00 |
|
Andrzej Kapolka
|
87f7e2465f
|
Missed a spot.
|
2014-02-11 17:25:25 -08:00 |
|
Andrzej Kapolka
|
a9b415b0f9
|
More build settings.
|
2014-02-11 17:22:40 -08:00 |
|
Andrzej Kapolka
|
b3fba320fc
|
We need the dependencies, too.
|
2014-02-11 17:03:24 -08:00 |
|
Andrzej Kapolka
|
25066f8b4f
|
Starting on Visage integration.
|
2014-02-11 16:44:25 -08:00 |
|
Andrzej Kapolka
|
78e15e0212
|
Starting on Visage support.
|
2014-02-11 16:03:23 -08:00 |
|
stojce
|
7fc66392cc
|
Interface OS X hifi URL scheme
|
2014-02-08 12:04:55 +01:00 |
|
Stephen Birarda
|
495d227950
|
remove Faceshift here report, Quazip find module
|
2014-01-16 14:18:27 -08:00 |
|
Stephen Birarda
|
323aa18c0e
|
remove MotionDriver and pthread libraries
|
2014-01-16 14:16:38 -08:00 |
|
Andrzej Kapolka
|
865b495e6c
|
Merge branch 'master' of https://github.com/worklist/hifi into debone
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
|
2014-01-16 13:35:03 -08:00 |
|
Brad Hefta-Gaub
|
35016c7d69
|
make faceshift compile sources on windows to address linker error
|
2014-01-14 10:20:27 -08:00 |
|
Brad Hefta-Gaub
|
b3e3bcbe1b
|
adding more opencv libraries and fix cmake for opencv and faceshift for windows
|
2014-01-13 20:12:31 -08:00 |
|
Stephen Birarda
|
133ba3a230
|
remove Leap integration from CMakeLists
|
2014-01-06 11:13:19 -08:00 |
|
Andrzej Kapolka
|
0a56f54675
|
Tiny fix for CMake caching on Linux/LibOVR.
|
2013-12-11 10:48:17 -08:00 |
|
Stephen Birarda
|
146d5294a0
|
more PortAudio cleanup in cmake
|
2013-12-05 16:51:04 -08:00 |
|
Stephen Birarda
|
40a1517108
|
remove PortAudio entirely
|
2013-12-03 12:38:26 -08:00 |
|
Andrzej Kapolka
|
0e0685af04
|
New Oculus software with Linux support.
|
2013-11-25 17:30:51 -08:00 |
|
Andrzej Kapolka
|
0231ed133c
|
Optional compilation for Sixense.
|
2013-11-18 12:09:52 -08:00 |
|
Andrzej Kapolka
|
9c401607b1
|
Missed the actual files.
|
2013-11-15 18:47:25 -08:00 |
|
Stephen Birarda
|
cb2cb05688
|
remove the STK library as it is no longer needed
|
2013-10-21 16:32:32 -07:00 |
|
Andrzej Kapolka
|
213a8fcd63
|
Working on Faceshift integration.
|
2013-09-03 11:52:32 -07:00 |
|