Brad Davis
d7a850d7be
Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix
...
Hifi 3 d connexion cmake fix
2015-09-14 18:53:39 -07:00
MarcelEdward
c1ddf5fc32
Update Find3DConnexionClient.cmake
2015-09-15 03:22:44 +02:00
MarcelEdward
8a71b31af0
Update Find3DConnexionClient.cmake
2015-09-15 03:06:07 +02:00
MarcelEdward
c3ecbd15f8
Update Find3DConnexionClient.cmake
2015-09-15 00:30:49 +02:00
Stephen Birarda
710e369b70
don't have polyvox build bindings
2015-09-10 08:52:24 -07:00
Stephen Birarda
255f896f7b
remove extra cmake debug
2015-09-08 15:21:34 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Andrew Meadows
802b3a88c3
more corret cmake file for sixense
2015-09-01 09:45:14 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Seiji Emery
d29a368688
removed debug
2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589
try removing quotes...
2015-08-25 16:21:38 -07:00
Seiji Emery
248d0729a6
test
2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32
test
2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8
changed setup_project to only use the generated shader source files
2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef
force cmake autoscribe to use full paths
2015-08-25 13:46:50 -07:00
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8
fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/
2015-08-24 13:13:24 -07:00
MarcelEdward
3ab63ba613
Update Find3DConnexionClient.cmake
...
The space navigator stopped working, this hopefully will fix it.
The framework is 3DconnexionClient.framework for osx, not sure why connexion named it that way. It is a library in /Library/Frameworks, the library name is in stone.
for apple, this works in cmake/modules/Find3DConnexionClient.cmake
find_library(3DConnexionClient 3DconnexionClient)
And for windows it has to find the I3dMouseParams.h file in interface/external/3dconnexionclient/includes.
So for windows the line in Find3DConnexionClient.cmake has to be:
hifi_library_search_hints("3dconnexionclient")
2015-08-22 22:48:51 +02:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Brad Davis
aba7bebf6e
Revert "Updating to the new version of the sixense library"
2015-08-19 09:44:51 -07:00
Brad Davis
7f09df1d0b
Fixing external
2015-08-18 18:56:01 -07:00
Brad Davis
86e21c91ba
Case issues again
2015-08-18 18:56:00 -07:00
Brad Davis
eba446e7f6
Updating to the new version of the sixense library
2015-08-18 18:55:59 -07:00
Leonardo Murillo
cda5b29fd3
Another take at versioning details exchange - checkpoint
2015-08-13 14:19:13 -06:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Stephen Birarda
653e0d29c7
resolve conflicts on merge with upstream/core
2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb
repairs for build type of glew external
2015-08-05 14:30:36 -07:00
Bradley Austin Davis
252677e1c2
Fix MD5 of glew dep
2015-08-05 14:02:14 -07:00
Brad Davis
754bf5c6f7
Merge pull request #5509 from birarda/core
...
get GLEW for all platforms as external project
2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Stephen Birarda
34e188fe6e
log more of the steps for glew external project
2015-08-05 12:35:37 -07:00
Stephen Birarda
cc909507f4
get GLEW for all platforms as external project
2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a
Removing integrated glew
2015-08-05 11:21:59 -07:00
David Rowe
1201073709
Add DLLs needed for Interface to run without iViewHMD installed
2015-08-04 13:15:26 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
86ad490bde
Fix to build on build PC without iViewHMD software installed
2015-08-03 20:52:11 -07:00
Sam Gondelman
95232920f1
trying to fix mac linking errors
2015-08-03 16:35:34 -07:00
Sam Gondelman
c9780338ae
merge from master
2015-08-03 16:27:45 -07:00
David Rowe
7749b912ea
Merge branch 'master' into 20639
2015-08-03 09:55:35 -07:00
David Rowe
e300eb27c0
Fix libs directory path
2015-08-03 09:55:14 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Sam Gondelman
647bb2b9ce
removing unnecessary weak link
2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94
more work on cleaning up connexion
2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
SamGondelman
e8daee013e
windows finds framework
2015-07-31 16:27:10 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
