Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tools/Extractors: Build fixes for linux

Browse Source
This commit is contained in:
Shauren
2014-10-19 14:40:13 +02:00
parent e2c2bce90f
commit 035bda05ad
3 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/map_extractor/loadlib/loadlib.h
View File

@@ -21,24 +21,9 @@
#include "CascLib.h"
#include <map>
#include <cstdint>
#include <string>
#ifdef _WIN32
typedef __int64 int64;
typedef __int32 int32;
typedef __int16 int16;
typedef __int8 int8;
typedef unsigned __int64 uint64;
typedef unsigned __int32 uint32;
typedef unsigned __int16 uint16;
typedef unsigned __int8 uint8;
#else
#include <stdint.h>
#ifndef uint64_t
#ifdef __linux__
#include <linux/types.h>
#endif
#endif
typedef int64_t int64;
typedef int32_t int32;
typedef int16_t int16;
@@ -47,6 +32,9 @@ typedef uint64_t uint64;
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
#ifndef _WIN32
int GetLastError();
#endif
#define FILE_FORMAT_VERSION 18

2
src/tools/mmaps_generator/TerrainBuilder.cpp
View File

@@ -609,7 +609,7 @@ namespace MMAP
int holeRow = row % 8;
int holeCol = (square - (row * 128 + cellCol * 8));
return holes[cellRow][cellCol][holeRow] & (1 << holeCol);
return (holes[cellRow][cellCol][holeRow] & (1 << holeCol)) != 0;
}
/**************************************************************************/

25
src/tools/vmap4_extractor/mpqfile.h
View File

@@ -11,25 +11,9 @@
#include <vector>
#include <iostream>
#include <deque>
#include <cstdint>
#include "CascLib.h"
#ifdef _WIN32
#include <Windows.h> // mainly only HANDLE definition is required
typedef __int64 int64;
typedef __int32 int32;
typedef __int16 int16;
typedef __int8 int8;
typedef unsigned __int64 uint64;
typedef unsigned __int32 uint32;
typedef unsigned __int16 uint16;
typedef unsigned __int8 uint8;
#else
#include <stdint.h>
#ifndef uint64_t
#ifdef __linux__
#include <linux/types.h>
#endif
#endif
typedef int64_t int64;
typedef int32_t int32;
typedef int16_t int16;
@@ -38,9 +22,12 @@ typedef uint64_t uint64;
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
#endif
using namespace std;
#ifdef _WIN32
#include <Windows.h> // mainly only HANDLE definition is required
#else
int GetLastError();
#endif
class MPQFile
{