Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more windows build hackery

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-10 20:36:37 -08:00
parent 44893b0a8c
commit b0f8e21d06
4 changed files with 66 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/avatars/src/AvatarData.h
View file

@ -10,7 +10,20 @@
#define __hifi__AvatarData__
#include <string>
/* VS2010 defines stdint.h, but not inttypes.h */
#if defined(_MSC_VER)
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#define PRId64 "I64d"
#else
#include <inttypes.h>
#endif
#include <vector>
#include <glm/glm.hpp>

16
libraries/octree/src/OctreeQuery.h
View file

@ -10,7 +10,23 @@
#define __hifi__OctreeQuery__
#include <string>
/* VS2010 defines stdint.h, but not inttypes.h */
#if defined(_MSC_VER)
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef signed long long int64_t;
typedef unsigned long long uint64_t;
#define PRId64 "I64d"
#else
#include <inttypes.h>
#endif
#include <vector>
#include <glm/glm.hpp>

4
libraries/shared/src/NodeList.cpp
View file

@ -533,9 +533,13 @@ void NodeList::sendDomainServerCheckIn() {
const int IP_ADDRESS_BYTES = 4;
// check in packet has header, optional UUID, node type, port, IP, node types of interest, null termination
#ifdef _WIN32
const int numPacketBytes = MAX_PACKET_SIZE;
#else
int numPacketBytes = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) +
NUM_BYTES_RFC4122_UUID + (2 * (sizeof(uint16_t) + IP_ADDRESS_BYTES)) +
numBytesNodesOfInterest + sizeof(unsigned char);
#endif
unsigned char checkInPacket[numPacketBytes];
unsigned char* packetPosition = checkInPacket;

2
libraries/voxels/src/Tags.h
View file

@ -9,6 +9,8 @@
#ifndef __hifi__Tags__
#define __hifi__Tags__
#include <stdint.h>
#include <cstdlib>
#include <cstring>