Emulation/EmulationStation
1
0
Fork 0
mirror of https://github.com/Aloshi/EmulationStation.git synced 2024-05-16 03:10:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from codinghipster/master

Browse source 
Fix linux (fedora) compilation issues
This commit is contained in:
Alec Lofquist 2018-08-26 10:21:06 -07:00 committed by GitHub
parent d24c0ccdd1 49ccd8fc7a
commit 9cc42adff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-core/src/Util.cpp
View file

@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
}
#if _MSC_VER < 1800
#if defined(_WIN32) && _MSC_VER < 1800
float round(float num)
{
return (float)((int)(num + 0.5f));

2
es-core/src/Util.h
View file

@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat);
Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
#if defined(_WIN32) && _MSC_VER < 1800
float round(float num);
#endif
std::string getCanonicalPath(const std::string& str);