v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed WindowsStore checks

pull/2633/head
Ryan McCampbell 2019-09-03 23:13:44 -04:00
parent a16906686f
commit eb762e654e
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Common/DefaultIOSystem.cpp
View File

@ -85,7 +85,7 @@ static std::string WideToUtf8(const wchar_t* in)
// Tests for the existence of a file at the given path. // Tests for the existence of a file at the given path.
bool DefaultIOSystem::Exists(const char* pFile) const bool DefaultIOSystem::Exists(const char* pFile) const
{ {
#if defined(_WIN32) && !defined(WindowsStore) #ifdef _WIN32
struct __stat64 filestat; struct __stat64 filestat;
if (_wstat64(Utf8ToWide(pFile).c_str(), &filestat) != 0) { if (_wstat64(Utf8ToWide(pFile).c_str(), &filestat) != 0) {
return false; return false;
@ -107,7 +107,7 @@ IOStream* DefaultIOSystem::Open(const char* strFile, const char* strMode)
ai_assert(strFile != nullptr); ai_assert(strFile != nullptr);
ai_assert(strMode != nullptr); ai_assert(strMode != nullptr);
FILE* file; FILE* file;
#if defined(_WIN32) && !defined(WindowsStore) #ifdef _WIN32
file = ::_wfopen(Utf8ToWide(strFile).c_str(), Utf8ToWide(strMode).c_str()); file = ::_wfopen(Utf8ToWide(strFile).c_str(), Utf8ToWide(strMode).c_str());
#else #else
file = ::fopen(strFile, strMode); file = ::fopen(strFile, strMode);
@ -150,21 +150,12 @@ inline static std::string MakeAbsolutePath(const char* in)
ai_assert(in); ai_assert(in);
std::string out; std::string out;
#ifdef _WIN32 #ifdef _WIN32
#ifndef WindowsStore
wchar_t* ret = ::_wfullpath(nullptr, Utf8ToWide(in).c_str(), 0); wchar_t* ret = ::_wfullpath(nullptr, Utf8ToWide(in).c_str(), 0);
if (ret) { if (ret) {
out = WideToUtf8(ret); out = WideToUtf8(ret);
free(ret); free(ret);
} }
#else #else
char* ret = ::_fullpath(nullptr, in, 0);
if (ret) {
out = ret;
free(ret);
}
#endif
#else
// use realpath
char* ret = realpath(in, nullptr); char* ret = realpath(in, nullptr);
if (ret) { if (ret) {
out = ret; out = ret;