From ac33b32cb5b731007208a360b49cc6267435b70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 14 Jul 2017 23:38:45 -0700 Subject: [PATCH] Fixed windows build. --- examples/common/entry/entry.cpp | 8 ++++---- tools/texturev/texturev.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index 867d57335..84cb5ee12 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -62,10 +62,10 @@ namespace entry typedef bx::FileReader super; public: - virtual bool open(const char* _filePath, bx::Error* _err) BX_OVERRIDE + virtual bool open(const bx::FilePath& _filePath, bx::Error* _err) BX_OVERRIDE { String filePath(s_currentDir); - filePath.append(_filePath); + filePath.append(_filePath.get() ); return super::open(filePath.getPtr(), _err); } }; @@ -75,10 +75,10 @@ namespace entry typedef bx::FileWriter super; public: - virtual bool open(const char* _filePath, bool _append, bx::Error* _err) BX_OVERRIDE + virtual bool open(const bx::FilePath& _filePath, bool _append, bx::Error* _err) BX_OVERRIDE { String filePath(s_currentDir); - filePath.append(_filePath); + filePath.append(_filePath.get() ); return super::open(filePath.getPtr(), _append, _err); } }; diff --git a/tools/texturev/texturev.cpp b/tools/texturev/texturev.cpp index 7fc70c090..f60b39304 100644 --- a/tools/texturev/texturev.cpp +++ b/tools/texturev/texturev.cpp @@ -712,8 +712,8 @@ void setGeometry( } else { - const float sx = _width; - const float sy = _height; + const float sx = float(_width); + const float sy = float(_height); const float px = float(_x) - sx/2.0f; const float py = float(_y); @@ -855,10 +855,10 @@ void associate() if (err.isOk() ) { std::string cmd; - bx::stringPrintf(cmd, "regedit.exe /s %s", temp); + bx::stringPrintf(cmd, "/s %s", temp); bx::ProcessReader reader; - if (bx::open(&reader, cmd.c_str(), &err) ) + if (bx::open(&reader, "regedit.exe", cmd.c_str(), &err) ) { bx::close(&reader); }