浏览代码

From Dušan Jocić: convexDecomp vs2015+ compatibility patch
(Verified with https://github.com/GarageGames/Torque3D/pull/1376 for sub vs2015)

Azaezel 10 年之前
父节点
当前提交
a487583946
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      Engine/lib/convexDecomp/NvRemoveTjunctions.cpp

+ 5 - 1
Engine/lib/convexDecomp/NvRemoveTjunctions.cpp

@@ -60,8 +60,12 @@ NvRemoveTjunctions.cpp : A code snippet to remove tjunctions from a triangle mes
 #include <vector>
 #include <vector>
 #ifdef __APPLE__
 #ifdef __APPLE__
    #include <ext/hash_map>
    #include <ext/hash_map>
-#else
+#elif LINUX
    #include <hash_map>
    #include <hash_map>
+#elif _MSC_VER < 1500
+   #include <hash_map>
+#elif _MSC_VER > 1800
+   #include <unordered_map>
 #endif
 #endif
 #include "NvUserMemAlloc.h"
 #include "NvUserMemAlloc.h"
 #include "NvHashMap.h"
 #include "NvHashMap.h"