Leonardo Murillo
8b573cebfb
Successfull windows build given any build type checkpoint
2015-11-23 15:16:48 -06:00
Leonardo Murillo
8e12e32dd2
Checkpoint - Windows specifics
2015-11-23 14:21:06 -06:00
Ryan Huffman
d1e9e28522
Update bullet tgz md5sum
2015-11-20 16:11:12 -08:00
Ryan Huffman
3aa271d688
Update bullet tgz md5sum
2015-11-20 15:21:53 -08:00
Ryan Huffman
67d0792173
Update bullet tgz md5sum
2015-11-20 15:09:06 -08:00
Ryan Huffman
7e87ad5114
Update bullet tgz md5sum
2015-11-20 14:50:31 -08:00
Ryan Huffman
784df60a97
Update bullet archive to include CCD+Compound improvements
2015-11-20 13:56:20 -08:00
Leonardo Murillo
e17d0b2af3
Bundling and consolidating deployment package
2015-11-20 15:10:56 -06:00
Leonardo Murillo
6105191a3f
OS X Bundling
2015-11-20 14:45:25 -06:00
Leonardo Murillo
6f3d818121
Checkpoint - fixing ID in dylib
2015-11-20 10:56:47 -06:00
Leonardo Murillo
c56a3b6d22
Checkpoint - turning quazip into external
2015-11-20 09:56:10 -06:00
Leonardo Murillo
f981fb9f46
Initial stack manager commit
2015-11-19 18:27:58 -06:00
Brad Davis
ec918a1cf5
Fix OpenSSL 64 bit search logic
2015-11-17 19:10:16 -08:00
Brad Davis
68c6718d1c
Fixes for windows 64 bit builds
2015-11-17 18:22:00 -08:00
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
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
SamGondelman
25e75bcc79
WIP: trying to fix windows not finding framework
2015-07-30 18:11:24 -07:00
Sam Gondelman
a01a4f929f
removing unnecessary weak link
2015-07-30 15:14:51 -07:00
Sam Gondelman
b8f7d4b8c8
more work on cleaning up connexion
2015-07-30 13:19:05 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
David Rowe
02ae008c9c
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-07-29 16:24:30 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
David Rowe
70d155048f
Add SMI iViewHMD eye tracking as an optional library
2015-07-27 14:43:32 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Bradley Austin Davis
6d8adbf2b5
Make OpenVR windows only for now
2015-07-27 09:13:04 -04:00
Bradley Austin Davis
671bda8883
Working on linux build
2015-07-25 20:58:13 -04:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
