Stephen Birarda
|
5904d19603
|
Merge pull request #2637 from birarda/authentication
add optional DTLS option for domain-server to node communication
|
2014-04-14 10:24:17 -07:00 |
|
Stephen Birarda
|
9fcb656027
|
add a newline to FindGnuTLS and fix filename in header
|
2014-04-11 09:26:45 -07:00 |
|
Stephen Birarda
|
f51b7a78c6
|
look only in lib for GnuTLS library
|
2014-04-10 09:32:44 -07:00 |
|
Stephen Birarda
|
31382b7e12
|
add a message for Win32 users to generate the MSVC GnuTLS import library
|
2014-04-09 17:41:18 -07:00 |
|
Stephen Birarda
|
17d2e14f0f
|
find correct parent include folder for gnutls
|
2014-04-09 17:33:41 -07:00 |
|
Stephen Birarda
|
8b23addc47
|
prepend the gnutls library with lib for windows find
|
2014-04-09 17:31:11 -07:00 |
|
Stephen Birarda
|
35519e07dc
|
quote dashed library name to potentially fix find on windows
|
2014-04-09 17:27:37 -07:00 |
|
Stephen Birarda
|
d54c21cdf1
|
fix path suffixes for gnutls headers
|
2014-04-09 17:23:13 -07:00 |
|
Stephen Birarda
|
03bb2573d1
|
look in bin folder to find GnuTLS on windows
|
2014-04-09 17:18:34 -07:00 |
|
Stephen Birarda
|
1c861fbecb
|
resolve conflicts on merge with upstream master
|
2014-04-09 15:36:15 -07:00 |
|
Andrzej Kapolka
|
f707719f4e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
|
2014-04-09 15:34:29 -07:00 |
|
Andrzej Kapolka
|
ef8eb00778
|
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
|
2014-04-09 15:23:11 -07:00 |
|
Stephen Birarda
|
c208af2246
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-09 15:10:48 -07:00 |
|
Stephen Birarda
|
3f84f36d60
|
add proper boilerplate to GnuTLS find module
|
2014-04-09 15:00:57 -07:00 |
|
Stephen Birarda
|
d4f2c9e631
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-04-09 14:40:14 -07:00 |
|
Stephen Birarda
|
6ce5a24460
|
missed copyright cleanups in apache header
|
2014-04-09 09:44:38 -07:00 |
|
Stephen Birarda
|
fbd2066b0c
|
more apache licensing for cmake files
|
2014-04-09 09:25:34 -07:00 |
|
Stephen Birarda
|
ff9fd2d8e9
|
tweak headers in cmake find modules
|
2014-04-08 17:49:30 -07:00 |
|
Andrzej Kapolka
|
98011da1ef
|
Starting on Faceplus integration.
|
2014-04-08 17:07:45 -07:00 |
|
Jeroen Baert
|
d2800ccd55
|
For some GLEW distributions, it's just lib
|
2014-04-03 11:52:13 +01:00 |
|
Stephen Birarda
|
6c08e2a407
|
add option for domain-server to enforce DTLS
|
2014-03-31 15:06:58 -07:00 |
|
Stephen Birarda
|
dc38b27485
|
using GnuTLS read self-signed key and cert on DS load
|
2014-03-31 12:31:34 -07:00 |
|
Stephen Birarda
|
9ae06913a0
|
remove QCA which only supports DTLS v1
|
2014-03-31 09:45:19 -07:00 |
|
Stephen Birarda
|
89aeb034d1
|
add find module for QCA and link to interface and DS
|
2014-03-28 15:22:44 -07:00 |
|
Dimitar Dobrev
|
f427f524bf
|
Patched the Qt CMake function for auto-translations so that *.ts files
are not deleted on clean.
|
2014-03-12 01:24:31 +02:00 |
|
Dimitar Dobrev
|
e10dacdbfe
|
Changed the searcning for qxmpp to include debug libraries as well.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
86643803cf
|
Moved the connection and configuration of XMPP to the log-in process.
|
2014-03-12 01:24:30 +02:00 |
|
Dimitar Dobrev
|
1c2e752f3c
|
Integrated QXmpp in the build system.
|
2014-03-12 01:16:10 +02:00 |
|
Stephen Birarda
|
002738037c
|
only look for the 32-bit oculus lib on windows
|
2014-03-10 09:28:20 -07:00 |
|
Stephen Birarda
|
4e382099fb
|
have FindGLEW only look for 32-bit static lib
|
2014-03-10 09:27:32 -07:00 |
|
Stephen Birarda
|
6d5515a41d
|
clarify that Windows builds are 32-bit, fix double GLEW_STATIC
|
2014-03-10 09:27:01 -07:00 |
|
ZappoMan
|
9c93149bd7
|
fix searching for sixense SDK on windows
|
2014-03-08 18:46:36 -08:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -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
|
a72cac8c9c
|
default to using Release LibOVR, include instructions for OS X rebuild
|
2014-03-07 14:31:59 -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 |
|