Commit graph

11686 commits

Author SHA1 Message Date
Stephen Birarda
7d4399da35 don't use reserved word causing issues on windows 2014-04-10 11:01:17 -07:00
Stephen Birarda
52203bd36e another attempt to repair QNetworkInterface call on windows 2014-04-10 10:58:20 -07:00
Stephen Birarda
ad0776be4e repair QNetworkConfigurationManager include 2014-04-10 10:55:02 -07:00
Stephen Birarda
714db42f87 include QNetworkConfigManager to fix HifiSockAddr error on windows 2014-04-10 10:51:20 -07:00
Stephen Birarda
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -07:00
Stephen Birarda
da24483d7c include WS2tcpip for socklen_t on windows 2014-04-10 10:45:43 -07:00
Stephen Birarda
b87c04444e include winsock2 from HifiSockAddr 2014-04-10 10:41:01 -07:00
Stephen Birarda
8b19982e61 commit missing Syssocket removals to Node and Logging 2014-04-10 10:36:30 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d fix GnuTLS include dir variable name 2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e link to GnuTLS library from script-engine 2014-04-10 10:12:09 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
ba6f861ad8 fix unmatched #ifdef in Syssocket 2014-04-10 09:54:37 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
1d5644a85f link GnuTLS to octree library 2014-04-10 09:45:57 -07:00
Stephen Birarda
7e2b73906c remove Syssocket include from SharedUtil 2014-04-10 09:35:25 -07:00
Stephen Birarda
f51b7a78c6 look only in lib for GnuTLS library 2014-04-10 09:32:44 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -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
3d071e85d5 link GnuTLS to the assignment-client 2014-04-09 17:37:23 -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
AndrewMeadows
89c2812551 Merge pull request #2631 from birarda/master
move repo over to Apache 2.0 license
2014-04-09 15:34:00 -07:00
Stephen Birarda
11d8d0596a fix ModelUploader header after move 2014-04-09 15:15:43 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3fe5af1505 update boilerplate and include guards for other new files 2014-04-09 15:08:56 -07:00
Stephen Birarda
5a79079c09 fix boilerplates in new DTLS files 2014-04-09 15:03:56 -07:00
Stephen Birarda
3f84f36d60 add proper boilerplate to GnuTLS find module 2014-04-09 15:00:57 -07:00
Stephen Birarda
7dec499b79 fix accidental changes to Audio.cpp 2014-04-09 14:52:01 -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
49a9653399 Merge pull request #2619 from Atlante45/master
Moved ModelUploader to interface + New error messages
2014-04-09 14:38:36 -07:00
Atlante45
7578b282e2 CR 2014-04-09 14:12:11 -07:00
Atlante45
b05b5a1c7b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 14:11:22 -07:00
Stephen Birarda
973fb95c9d Merge pull request #2630 from AndrewMeadows/scripting
Expose MyAvatar.sessionUUID to JS
2014-04-09 13:07:37 -07:00
Andrew Meadows
698e3783e0 fixing formatting 2014-04-09 13:06:29 -07:00
Stephen Birarda
a33263ec22 Merge pull request #2594 from Forceflow/master
GLEW detection on Win32 fix
2014-04-09 13:03:00 -07:00
Andrew Meadows
7304049f83 update boiler plate to abide by new standard 2014-04-09 12:55:29 -07:00
Clément Brisset
184718318c Merge pull request #2634 from stojce/19548
#19548 Modify icons in Interface "mirror"
2014-04-09 12:32:04 -07:00
Stephen Birarda
29f8ed3c09 manually fix Plane include guard since regex did not catch 2014-04-09 12:03:57 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
0a9c7e3d74 add an include guard to Stats 2014-04-09 11:35:20 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00
Stephen Birarda
ced5e72d39 add date to capsule shape 2014-04-09 10:46:36 -07:00