Fix Linux build

This commit is contained in:
Wojtek Figat
2021-04-30 17:03:40 +02:00
parent c785f9106b
commit 167f7e268d
4 changed files with 8 additions and 6 deletions

View File

@@ -7,6 +7,7 @@
#include "Engine/Platform/FileSystem.h"
#include "Engine/Core/Config/PlatformSettings.h"
#include "Engine/Engine/CommandLine.h"
#include "Engine/Engine/Globals.h"
#include "Engine/Graphics/Textures/TextureData.h"
// hack using TextureTool in Platform module -> TODO: move texture data sampling to texture data itself
#define COMPILE_WITH_TEXTURE_TOOL 1

View File

@@ -6,6 +6,7 @@
#include "Engine/Platform/File.h"
#include "Engine/Core/Types/String.h"
#include "Engine/Core/Types/StringView.h"
#include "Engine/Core/Types/TimeSpan.h"
#include "Engine/Core/Math/Math.h"
#include "Engine/Utilities/StringConverter.h"
#include <sys/types.h>

View File

@@ -2031,8 +2031,8 @@ bool LinuxPlatform::Init()
char buffer[UNIX_APP_BUFF_SIZE];
// Get user locale string
char* locale = setlocale(LC_ALL, NULL);
if (strcmp (locale, "C") == 0)
const char* locale = setlocale(LC_ALL, NULL);
if (strcmp(locale, "C") == 0)
locale = "";
UserLocale = String(locale);

View File

@@ -15,6 +15,8 @@
#include <cctype>
#include <cerrno>
#include <climits>
#include <limits>
#include <limits.h>
#include <math.h>
#include <cstdarg>
#include <cstddef> // for std::ptrdiff_t
@@ -303,13 +305,11 @@ class fp {
// All sizes are in bits.
static FMT_CONSTEXPR_DECL const int char_size =
8;
//std::numeric_limits<unsigned char>::digits;
std::numeric_limits<unsigned char>::digits;
// Subtract 1 to account for an implicit most significant bit in the
// normalized form.
static FMT_CONSTEXPR_DECL const int double_significand_size =
52 - 1;
//std::numeric_limits<double>::digits - 1;
std::numeric_limits<double>::digits - 1;
static FMT_CONSTEXPR_DECL const uint64_t implicit_bit =
1ull << double_significand_size;