aboutsummaryrefslogtreecommitdiff
path: root/APEX_1.4/NvParameterized/src/NvSerializer.cpp
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/NvParameterized/src/NvSerializer.cpp
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/NvParameterized/src/NvSerializer.cpp')
-rw-r--r--APEX_1.4/NvParameterized/src/NvSerializer.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/APEX_1.4/NvParameterized/src/NvSerializer.cpp b/APEX_1.4/NvParameterized/src/NvSerializer.cpp
index 76b48a07..280f4bce 100644
--- a/APEX_1.4/NvParameterized/src/NvSerializer.cpp
+++ b/APEX_1.4/NvParameterized/src/NvSerializer.cpp
@@ -95,6 +95,8 @@ const SerializePlatform &GetCurrentPlatform()
platform.osType = SerializePlatform::OS_ANDROID;
# elif PX_LINUX == 1
platform.osType = SerializePlatform::OS_LINUX;
+# elif PX_NX == 1
+ platform.osType = SerializePlatform::OS_HOS;
# else
# error "Undefined OS"
# endif
@@ -112,6 +114,8 @@ const SerializePlatform &GetCurrentPlatform()
platform.archType = SerializePlatform::ARCH_CELL;
# elif PX_ARM == 1
platform.archType = SerializePlatform::ARCH_ARM;
+# elif PX_A64 == 1
+ platform.archType = SerializePlatform::ARCH_ARM_64;
# else
# error "Unknown architecture"
# endif
@@ -178,6 +182,18 @@ bool GetPlatform(const char *name, SerializePlatform &platform_)
platform_.compilerType = SerializePlatform::COMP_GCC;
platform_.osType = SerializePlatform::OS_ANDROID;
}
+ else if (0 == strcmp("HOSARM32", name))
+ {
+ platform_.archType = SerializePlatform::ARCH_ARM;
+ platform_.compilerType = SerializePlatform::COMP_GCC;
+ platform_.osType = SerializePlatform::OS_HOS;
+ }
+ else if (0 == strcmp("HOSARM64", name))
+ {
+ platform_.archType = SerializePlatform::ARCH_ARM_64;
+ platform_.compilerType = SerializePlatform::COMP_GCC;
+ platform_.osType = SerializePlatform::OS_HOS;
+ }
else if( 0 == strcmp("GccLinux32", name) )
{
platform_.archType = SerializePlatform::ARCH_X86;
@@ -289,6 +305,18 @@ const char *GetPlatformName(const SerializePlatform &platform_)
return unknown;
}
+ case SerializePlatform::OS_HOS:
+ switch (platform.archType)
+ {
+ case SerializePlatform::ARCH_ARM:
+ return "HOSARM32";
+ case SerializePlatform::ARCH_ARM_64:
+ return "HOSARM64";
+
+ default:
+ return unknown;
+ }
+
case SerializePlatform::OS_LAST:
default:
return unknown;