Skip to content

Commit df35143

Browse files
committed
Merge branch '1'
2 parents ebf5c0b + 4d9353e commit df35143

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

Applications/Sfx/Compiler.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include <iostream>
1616
#include <regex>
1717
#include <functional>
18+
#include <chrono>
19+
#include <thread>
1820

1921
#if PLATFORM_STD_FILESYSTEM==1
2022
#include <filesystem>
@@ -1037,7 +1039,7 @@ int Compile(std::shared_ptr<ShaderInstance> shaderInstance
10371039
{
10381040
if (terminate_command)
10391041
exit(2000);
1040-
sleep(10);
1042+
std::this_thread::sleep_for(std::chrono::milliseconds(10));
10411043
}
10421044
if(!if_c.good())
10431045
{

Applications/Sfx/Sfx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ bool sfxParseEffectFromFile(int effect, const char *file, const std::vector<std:
647647
// if verbose, save the preprocessed text to a temporary file.
648648
if(sfxOptions->verbose)
649649
{
650-
char buffer[_MAX_PATH];
650+
//char buffer[_MAX_PATH];
651651
mkpath(sfxOptions->intermediateDirectory);
652652
ppfile=((string(sfxOptions->intermediateDirectory)+"/")+GetFilenameOnly(file))+"_pp";
653653
ofstream pps(ppfile);

Core/TrackingAllocator.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
#include "Platform/Core/StringFunctions.h"
33
#include "Platform/Core/RuntimeError.h"
44
#include <string.h> // for strlen
5-
#if PLATFORM_CXX20_OR_ABOVE
6-
#include <format>
75
#include <fmt/format.h>
8-
#else
9-
#include <fmt/format.h>
10-
#endif
116

127
using namespace platform;
138
using namespace core;

Math/Noise3D.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "Platform/Math/RandomNumberGenerator.h"
77
#include "Platform/Core/MemoryInterface.h"
88
#include <math.h>
9+
#include <cmath>
910

1011
using namespace platform::math;
1112

0 commit comments

Comments
 (0)