Some minor fixes for MinGW compiler
This commit is contained in:
parent
2f71c5f99f
commit
f3746c068c
@ -723,7 +723,7 @@ void FileManager::checkAndCreateConfigDir()
|
|||||||
if(!checkAndCreateDirectory(m_user_config_dir))
|
if(!checkAndCreateDirectory(m_user_config_dir))
|
||||||
{
|
{
|
||||||
Log::error("[FileManager]", "Can't create config dir '%s"
|
Log::error("[FileManager]", "Can't create config dir '%s"
|
||||||
", falling back to '.'.", m_user_config_dir);
|
", falling back to '.'.", m_user_config_dir.c_str());
|
||||||
m_user_config_dir = ".";
|
m_user_config_dir = ".";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
// btAlignedObjectArray to enable bullet SSE optimisations.
|
// btAlignedObjectArray to enable bullet SSE optimisations.
|
||||||
// On the other hand, std::vector gives much better debugging features.
|
// On the other hand, std::vector gives much better debugging features.
|
||||||
// So SSE is disabled in bullet on windows debug
|
// So SSE is disabled in bullet on windows debug
|
||||||
#if !defined(DEBUG) && (WIN32)
|
#if !defined(DEBUG) && defined(WIN32)
|
||||||
# undef USE_ALIGNED
|
# undef USE_ALIGNED
|
||||||
#else
|
#else
|
||||||
# undef USE_ALIGNED
|
# undef USE_ALIGNED
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* so we define the work arounds only for compiler versions before 18.00
|
* so we define the work arounds only for compiler versions before 18.00
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(WIN32) && _MSC_VER < 1800
|
#if defined(WIN32) && defined(_MSC_VER) && _MSC_VER < 1800
|
||||||
# include <math.h>
|
# include <math.h>
|
||||||
|
|
||||||
# define isnan _isnan
|
# define isnan _isnan
|
||||||
|
Loading…
x
Reference in New Issue
Block a user