matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows compile error, switch std::string to ByteString

Browse Source
This commit is contained in:
jacob1 2021-06-26 01:05:56 -04:00
parent d1016cf58d
commit 0292344328
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/Platform.cpp
View File

@ -10,6 +10,7 @@
#ifdef WIN
#define NOMINMAX
#include <direct.h>
#include <io.h>
#include <shlobj.h>
#include <shlwapi.h>
#include <windows.h>
@ -28,7 +29,7 @@
namespace Platform
{
std::string GetCwd()
ByteString GetCwd()
{
char cwdTemp[PATH_MAX];
getcwd(cwdTemp, PATH_MAX);
@ -187,7 +188,7 @@ void LoadFileInResource(int name, int type, unsigned int& size, const char*& dat
#endif
}
bool Stat(std::string filename)
bool Stat(ByteString filename)
{
#ifdef WIN
struct _stat s;
@ -205,7 +206,7 @@ bool Stat(std::string filename)
}
}
bool FileExists(std::string filename)
bool FileExists(ByteString filename)
{
#ifdef WIN
struct _stat s;
@ -230,7 +231,7 @@ bool FileExists(std::string filename)
}
}
bool DirectoryExists(std::string directory)
bool DirectoryExists(ByteString directory)
{
#ifdef WIN
struct _stat s;
@ -255,12 +256,12 @@ bool DirectoryExists(std::string directory)
}
}
bool DeleteFile(std::string filename)
bool DeleteFile(ByteString filename)
{
return std::remove(filename.c_str()) == 0;
}
bool DeleteDirectory(std::string folder)
bool DeleteDirectory(ByteString folder)
{
#ifdef WIN
return _rmdir(folder.c_str()) == 0;
@ -269,7 +270,7 @@ bool DeleteDirectory(std::string folder)
#endif
}
bool MakeDirectory(std::string dir)
bool MakeDirectory(ByteString dir)
{
#ifdef WIN
return _mkdir(dir.c_str()) == 0;

14
src/common/Platform.h
View File

@ -10,7 +10,7 @@
namespace Platform
{
std::string GetCwd();
ByteString GetCwd();
ByteString ExecutableName();
void DoRestart();
@ -21,23 +21,23 @@ namespace Platform
void LoadFileInResource(int name, int type, unsigned int& size, const char*& data);
bool Stat(std::string filename);
bool FileExists(std::string filename);
bool DirectoryExists(std::string directory);
bool Stat(ByteString filename);
bool FileExists(ByteString filename);
bool DirectoryExists(ByteString directory);
/**
* @return true on success
*/
bool DeleteFile(std::string filename);
bool DeleteFile(ByteString filename);
/**
* @return true on success
*/
bool DeleteDirectory(std::string folder);
bool DeleteDirectory(ByteString folder);
/**
* @return true on success
*/
bool MakeDirectory(std::string dir);
bool MakeDirectory(ByteString dir);
std::vector<ByteString> DirectorySearch(ByteString directory, ByteString search, std::vector<ByteString> extensions);
#ifdef WIN