Browse Source

Minimal requisite alterations for development head as of 02APR2014 for compilation purposes on VS2013.

Azaezel 11 years ago
parent
commit
59c755b5e5

+ 1 - 0
Engine/lib/collada/include/dae/daeTypes.h

@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <assert.h>
 #include <wchar.h>
 #include <wchar.h>
 #include <string.h>
 #include <string.h>
+#include <algorithm>
 
 
 #include <dae/daeError.h>
 #include <dae/daeError.h>
 
 

+ 2 - 0
Engine/source/core/strings/stringFunctions.h

@@ -35,6 +35,8 @@
 // These standard functions are not defined on Win32 and other Microsoft platforms...
 // These standard functions are not defined on Win32 and other Microsoft platforms...
 #define strcasecmp   _stricmp
 #define strcasecmp   _stricmp
 #define strncasecmp  _strnicmp
 #define strncasecmp  _strnicmp
+#endif
+#if (_MSC_VER < 1800) && (defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON))
 #define strtof       (float)strtod
 #define strtof       (float)strtod
 #endif
 #endif