浏览代码

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

Azaezel 11 年之前
父节点
当前提交
59c755b5e5
共有 2 个文件被更改,包括 3 次插入0 次删除
  1. 1 0
      Engine/lib/collada/include/dae/daeTypes.h
  2. 2 0
      Engine/source/core/strings/stringFunctions.h

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

@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <wchar.h>
 #include <string.h>
+#include <algorithm>
 
 #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...
 #define strcasecmp   _stricmp
 #define strncasecmp  _strnicmp
+#endif
+#if (_MSC_VER < 1800) && (defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON))
 #define strtof       (float)strtod
 #endif