Commit graph

781 commits

Author SHA1 Message Date
Brad Davis
0c60538952 Ensure that dependencies of runtime plugins are included in the DLL copy 2015-11-06 16:57:30 -08:00
Brad Davis
017cb2cb6c Getting rid of HTTPS external dependencies 2015-11-04 11:53:42 -08:00
Brad Davis
edf3e5b17a Try using the VS2010 builds from the new Sixense SDKs 2015-11-02 11:15:51 -08:00
Brad Davis
017e42bbc2 Update sixense SDK 2015-11-02 09:15:54 -08:00
Brad Hefta-Gaub
fe4a6fa2bf Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings 2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub
13e805ac15 replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case 2015-11-01 13:18:53 -08:00
Brad Davis
e0ac48fe27 PR comments 2015-11-01 12:19:19 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8 Make zlib a true external on windows (linux and OSX should rely on system libraries) 2015-11-01 01:36:59 -07:00
Brad Davis
7fa6fb1308 Remove GLEW spam in cmake 2015-11-01 01:36:12 -07:00
Brad Davis
aee03e79f3 Fix win32 and linux Sixense config 2015-10-30 22:37:00 -07:00
Bradley Austin Davis
9b9e35d396 Limit sixense to mavericks and below 2015-10-30 22:02:20 -07:00
Bradley Austin Davis
46d87dda5a Fixing paths for SDL2 and Sixense libs 2015-10-30 19:00:26 -07:00
Brad Davis
2518ada26f Merge pull request #6220 from sethalves/new-smi-runtime
update cmake to work with newer smi runtime
2015-10-30 10:40:04 -07:00
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Seth Alves
f01b4dcd90 update cmake to work with newer smi runtime 2015-10-29 09:23:19 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Stephen Birarda
06ca4dfbde fix polyvox double name change command 2015-09-28 14:26:53 -04:00
Ken Cooke
629ee7b0c1 Completely remove SOXR from cmake 2015-09-24 15:12:10 -07:00
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