aboutsummaryrefslogtreecommitdiff
path: root/APEX_1.4/shared/general/meshimport/include
diff options
context:
space:
mode:
authorsschirm <[email protected]>2017-02-27 16:40:12 +0100
committersschirm <[email protected]>2017-03-01 18:04:26 +0100
commit7840347c32755e94a807f978f1cbb558717ac8cf (patch)
tree295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /APEX_1.4/shared/general/meshimport/include
parentPre-release comments marking end of beta. (diff)
downloadphysx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz
physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'APEX_1.4/shared/general/meshimport/include')
-rw-r--r--APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImport.h2
-rw-r--r--APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImportTypes.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImport.h b/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImport.h
index 826aea16..d676c09e 100644
--- a/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImport.h
+++ b/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImport.h
@@ -664,7 +664,7 @@ public:
ret = value;
break;
}
-#if PX_ANDROID || PX_PS4 || PX_LINUX_FAMILY
+#if PX_ANDROID || PX_PS4 || PX_LINUX_FAMILY || PX_NX
else if (strcasecmp(key, _key) == 0)
#else
else if (::stricmp(key, _key) == 0)
diff --git a/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImportTypes.h b/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImportTypes.h
index cdc641f4..127c978b 100644
--- a/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImportTypes.h
+++ b/APEX_1.4/shared/general/meshimport/include/MeshImport/MeshImportTypes.h
@@ -79,7 +79,7 @@ namespace mimp
/**
Platform define
*/
-#ifdef _M_IX86
+#ifdef _M_IX86 || __EMSCRIPTEN__
#define MI_X86
#define MI_WINDOWS
#elif defined(_M_X64)