diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
| commit | d1c812f1162e5fdb13c215792725b2591d7428f5 (patch) | |
| tree | 407056c45c7e9320c48fca6a3697d81a061c4ea0 /APEX_1.4/shared | |
| parent | PhysX 3.4, APEX 1.4 patch release @22121272 (diff) | |
| download | physx-3.4-3.4.1.tar.xz physx-3.4-3.4.1.zip | |
PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1
Diffstat (limited to 'APEX_1.4/shared')
5 files changed, 7 insertions, 7 deletions
diff --git a/APEX_1.4/shared/external/include/DirEntry.h b/APEX_1.4/shared/external/include/DirEntry.h index 64fd54cb..7cf0fd2e 100644 --- a/APEX_1.4/shared/external/include/DirEntry.h +++ b/APEX_1.4/shared/external/include/DirEntry.h @@ -22,8 +22,8 @@ #include "linux/DirEntry.h" #elif PX_PS4 #include "ps4/DirEntry.h" -#elif PX_NX - #include "nx/DirEntry.h" +#elif PX_SWITCH + #include "switch/DirEntry.h" #else #error "Platform not supported!" #endif diff --git a/APEX_1.4/shared/external/src/UserAllocator.cpp b/APEX_1.4/shared/external/src/UserAllocator.cpp index ec131bc0..9177fde7 100644 --- a/APEX_1.4/shared/external/src/UserAllocator.cpp +++ b/APEX_1.4/shared/external/src/UserAllocator.cpp @@ -172,7 +172,7 @@ void* UserPxAllocator::allocate(size_t size, const char* typeName, const char* f #if PX_WINDOWS_FAMILY ret = ::_aligned_malloc(size, 16); -#elif PX_ANDROID || PX_LINUX_FAMILY || PX_NX +#elif PX_ANDROID || PX_LINUX_FAMILY || PX_SWITCH /* Allocate size + (15 + sizeof(void*)) bytes and shift pointer further, write original address in the beginning of block.*/ /* Weirdly, memalign sometimes returns unaligned address */ // ret = ::memalign(size, 16); @@ -203,7 +203,7 @@ void UserPxAllocator::deallocate(void* memory) { #if PX_WINDOWS_FAMILY ::_aligned_free(memory); -#elif PX_ANDROID || PX_LINUX_FAMILY || PX_NX +#elif PX_ANDROID || PX_LINUX_FAMILY || PX_SWITCH // Looks scary, but all it does is getting original unaligned block address back from 4/8 bytes (depends on pointer size) prior to <memory> pointer and frees this memory void* originalPtr = (void*)(*(size_t*)((char*)memory - sizeof(void*))); ::free(originalPtr); 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 d676c09e..071f746f 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 || PX_NX +#if PX_ANDROID || PX_PS4 || PX_LINUX_FAMILY || PX_SWITCH 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 127c978b..88092607 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 || __EMSCRIPTEN__ +#if defined(_M_IX86) || defined(__EMSCRIPTEN__) #define MI_X86 #define MI_WINDOWS #elif defined(_M_X64) diff --git a/APEX_1.4/shared/general/meshimport/src/utils/MiSutil.cpp b/APEX_1.4/shared/general/meshimport/src/utils/MiSutil.cpp index f92bafe1..b35d0dfa 100644 --- a/APEX_1.4/shared/general/meshimport/src/utils/MiSutil.cpp +++ b/APEX_1.4/shared/general/meshimport/src/utils/MiSutil.cpp @@ -646,7 +646,7 @@ const char * formatNumber(MiI32 number) // JWR format this integer into a fancy char scratch[512]; -#if defined (LINUX_GENERIC) || defined(LINUX) || defined(__CELLOS_LV2__) || defined(__APPLE__) || defined(ANDROID) || PX_PS4 || PX_LINUX_FAMILY || PX_NX +#if defined (LINUX_GENERIC) || defined(LINUX) || defined(__CELLOS_LV2__) || defined(__APPLE__) || defined(ANDROID) || PX_PS4 || PX_LINUX_FAMILY || PX_SWITCH snprintf(scratch, 10, "%d", number); #else itoa(number,scratch,10); |